Switched to Spring REST