0.6.7.11: another step toward centralizing address map