Support for dynamic master in maps

Resolves #403.