Added validation template and delete