Add validation and association