Working on RestMS support