Add parameterset support

Group options in 2 general functions