continue v2 update
Move validation logic to inside exec_ call