Made entities injectable