Refactor all commands to take advantage of the CommandBase options methods