Add context menu
Update for 1.1
Update for 1.1