don't need the separate statement an address handlers
WIP XdiContributor