Refactor Address spec

/cc @radar