Change to use @RestController annotation