Added validation and association.