Updating Adapter and Facade Pattern!