Converted to a Spring-boot app