validation support corrected and actions added