Added proper minimap support