Refactor stage one before 2.1 release
Refactor stage one before 2.1 release