Pushing latest changes up
Merging schema