made map more configurable