Added new form classes