Bring back single instantiation of field types