added touch class support & user options