Improved handling of async checks
Added additional constructor params to allow continuing validation