Rebuilt the model using the latest version of uData
Various tweaks and improvements