Should we have a separate class for maps and control access to maps only via methods? Currently, it is a little confusing on whether a map should be accessed directly or through a method. Making maps private fields of a separate class may help this problem.