Development

Refactoring and schema update