Move address into config