updated Entity model