Updated so subObjects have context menu