Added raw support