Updated to click 2.0