Updates to raw conversion