Entity model features (9/29)

Entity model features