[WIP][3.9] Add basket converter