Updated to use modifier_class