updated schema.
Fixed console
Merge branch 'test' into dev