Updating to use new REST controller