Added individual address fields