Better generic support for extra parameters