Anvil. Code refactoring in map suite.