Make paths more generic