June 7 Changes to schema