Updated REST shapes and vocabulary