Updated Bot-only Map Override

Some call optimizations, some code cleanup.