added support for modifiers