Make sure models are validated properly on export