Can we leave here String and refactor it in follow-up change?