Also add class name to command list