Added support for long and short parameters