1 change schema

Merge all schema changes into master