Updates to support color tables.