Update references from Controller to Service