fixed issues with OperationsService mapping