Add onRaw support