Updated dragon code for matching validation requirements