Updated commands to be immutable