Adding Addressing feature in Calculator Example