Task #927
Add map for organizations