Added context menu features