More work to commands and requests