Updated service controller