Simplify model definitions