Added option for manual address input