added rest support