Updated address manager interface