Switch to new Facade implementation