Moved taking data from raw generated raw data.
Moved const up, added argumentable call.