Optimized maps, removed slowdowns