Add raw support