Classes now fully supported