Keep track of a per-map storage handler variable. It can be accessed if needed...

Keep track of a per-map storage handler variable. It can be accessed if needed by adding a second parameter to the callback function.