Data validation added back to models