Update to work out of the box on 2.1