Rest version update

Adding some extra work on the rest version of the plugin