Facade refactoring