Updated data files and added a utility function