Entity model features (10/29)

Entity model features