RaaSFacade fixed