Update to Klein 2.1.x