Updated to use new paths