Updated: Model, database schema (1.6.x)