Added map advertisement support