Adding schema changes
Adding unmerged files