Would personally remove this and make the service immutable