Removed unnecessary object allocations for TapCallback api