Changed the logic for incorporating schema changes