add raw and string support.