Address entity is now obtained from the service manager allowing the address entity to be extended or replaced.