More data schema changes