Added additional checks in validation