Updated Entity model with Status table