Address entity is now obtained from the service manager allowing the add...

...ress entity to be extended or replaced.