Changes to introduce fully restfull interface