improve data model scheme