Added in schemas for Release 18