Small improvement in data model