Added --no-optimize flag for maps