Add support for extra parameters