Continue refactoring. Soon, we will no longer need Map