Modified validation