#1523| Making address fields configurable