Continued work, adding scan id column