Changed setter injection to constructor injection