Adding raw option