Added support for extra parameters captrue