2.0.0-SNAPSHOT refactoring