Updated map and logging configuration