Get rid of global rawData dependency