Adding Color module support