Adding REST support