Changes in how Models are parsed