Add experimental input checking