Added filename and added extra subrefs handling in MTAStateCollection