Moved fields to NS top.