LAMBDA-120: change to table and add file format