Changes for @Inject