Generated output of CreateModel is little better now