refactor: Streamlined the API of the services