Make a Dwh class singleton instead of creating a child class

Make a Dwh class singleton instead of creating a child class #56