Added address fields