Add support for lens >= 4.4