Add putAddress and findAddress