- Add the ability to select category/division mappings specific for each upstream server - Add some auto-determining code if the cat/div mappings don't exist