Added color support