Added colorcode support