Update TODO
Add method Raw and Scan