Added some more missing parameters that should be checked in already