Refactor Interfaces, database model completed