Add better path builder and make everything work again