Refactor for v1