Use hardcoded name in makfiel
Change some of the Facade pattern