Initial schema created
Merge branch 'improvement#3' into develop