Refactor - Created AddressManger for Address related functionality