Rebuilt with new resource paths