[ivi] Fix extraction and modernize