further data model work