Revert "Removing v1 logic"

This reverts commit c985034c048b3ab5cc28831bc41299bfd1b4993d.