Entitiy Models Updated