added colorMap and props