BUGFIX: DRY up Address based classes to fix a conflict