AS7-6577 Add validation for required elements