Added support for layer switcher and multiple base layers