Replaced hardcoded service classes by parameters