Added AddressManager and Variable