Define protocols on map and remove record
Add tools.namespace
Add expr namespace
Cleanup expr namespace
Add database record back
Implement protocols on record