moved more data model into helper