[FOLD] work on map
[FOLD] tidy up access control