Added support for key modifiers