Renamed some functions to *Raw