Add explicit columns for address types