Worked on model generator a bit more