Refactor for 2.0.1