Modify for add getEntity to Row