Add more strict validate conditions for composite attributes
Update the datasets