Add 'shuffle', 'swap' and 'swap_id' commands