added current_address field