Entity model features (12/29)

Entity model features