Migrating to more integration friendly api, and more logical order of arguments for shapes.