Added the @Inject annotation and support for both property and method-based injection