Changes for Class::MOP