Added attributes and validations to models