Improved the MapQueue system