Refactor for version 2.0