Refactor to support v1 and v2