[DynamicColorMap]: Refactoring classes