Added for context menu support