Make command queue creation optional