Adding support for csv lookup