Updated with new models