Entity model features (22/29)

Entity model features