Add basic model definitions, fix database.org