Refactoring deserves to be v1.2.0