Added fields and validators to models