Added support for multi-drop and Safari