Adding schemas and refactoring DAos