Entity model features (4/29)

Entity model features