Made the paths more generic