Initial checkin of HetMet / -XModalTypes modifications