partOf now using the field directly