Added class modifiers (should check name nesting