RM: Add Context Menu handling