Looking forward to using the standards based detection but it's not necessary for this PR.