More RestMS work