REST support partialy added