Preparing for v1.1