Fix raw format handler methods