Improve REST support