Finish implementing injectors, hook entity name method