Removed non-object parameters from services, closes #37