Added RestController and modified controllers