Conversion to the new Class building framework is working