Major changes to schema