More clean code and SchemaStore implemented