Converted address creation to a more standard method