Made map easily configurable