Latest changes includng REST changes