Add data/files collection support