Only pass in argClassCode if necessary
Only pass class code if needed