Add option for class output and silent classes