Added more color mapping