Next version including RESTful and improvements