Added a Facade and better object creation