Added delete option & enhanced validation