Finish up support for userName and groupName and clean up the rest of the parameters