More maps and refactoring