[RFR] Fix callback argument value to use entity object

This PR allows to use the entity within `callback` fields.