#26 removed unnecessary ParamProxy
#26 replaced references to the old service container