#232: Update queue commands for D8