Use new getEntity() call