More fixes to the model files, trying to get a good schema running