Refactoring: making schema
release 1.2.1