Fixed add_command & run_command