Added Color and Type types