Modified schema to match master