Modifications to enable REST support