Further progress in the move to Injection as the base type