Move address in a separate model