Modify validation