First half of schema changes made
Fixed merge changes from schema