Updated modeling files