Added to commands and error handling