add a bit more address generation for offline mode