Move address to its own factory