ColorMap Class improved