Converted to Spring Boot app