Apply classModel changes for thread safety