Move addresses to partials