Added callback methods for address saving