Re-add getEntity