Changes to move dependency injections to applicationContext.xml