KD: Made address as one to one