Update commands to match new Driver format