Added support for the raw format handler.