LILY-338: Update after feedback