Optimise data model