Adding Modal Validation