Add addr field as a non-mapped field.
Remove unneeded for attribute.