Entity model features (25/29)

Entity model features