minore
updated schema, refactoring