Make default paths more generic