Cleaned up ApiFacade