Added support for modifiers