Prepared refactoring for 2.0.0