Expanding to full REST interface