Add some more validation, available OID attributes are dynamic now.