close issue #4 with data models