Added constructor injection