Schema Changes For upcoming features