Works with standard mapchooser now