Update next version to 2.3.0, fix problem w/ external_address model move and naming