Refactoring for v1.1