Improve compilation and add data_path