1 change schema

Merge schema and other changes into master