WIP: Compatibility with services controller