Schema additions; Order + Priority partially implemented