Only add paths if needed