Updated the model generator to look a little better.