Updated Model-data Packaging