Added some rest functionality..