Add passReqToCallback support