Add validation and alert