Add proper address structure.