beautifying Names
add data model