Changed to use spring boot and java config