Added object for each model. Modified joint_feature to be per-potential