Added the raw option