Added code for getting address