added autoaddmaps support