Updated calls to addTraitClass, addMethod, addScale, addProperty