Entity model features (7/29)

Entity model features