add support for modifiers