Added metadata support for data files