Added additional information to handler fn invocation