Move new address callback code into callback