More reworking of fields and constraints [MJ-601]