More map optimizations and config file definitions.