Various changes to find a fix for Issue #1
Added support for filename as a separate column