issue #1667: Adding file name lookup support.