Add validation to models