Splitting out verification should avoid timeouts