REST additions for server and client