updated Facade to classes