Added classMode option