Refactoring to a much nicer way of registering both keyed and non keyed services at once