Refactor for major version update