Added support for non specified _pw fields.