refactoring: simplified map-related classes