Added some missing general parameter options