Changes on how data path is loaded