Modified Controller to use rest style