Added validation and Select2