Support for dynamic master in maps