Added class based foms and UTs