Added option to specify data path