#7: Added missing services and updated the controllers