Added more cases to commands