Update to v1.1, refactoring