More changes to accomodate new models