Minor fix to repository

Moved optional address outside of the oneOrMore. address shouldn't
repeat in repository.