change Map to immutable.HashMap