Finish simplifying the service layer