Initial update for address package rewrite and normalization