Upgraded to Spring 4 to run on java 8