Modified to get files and return Data*