added association links, and validations