Changed to constructor based injection.