Refactor: get rid of the parameter handling in favor of the common class providing this service.