Ok I will wait for this adaptation until others respond :) It will indeed be a quite invasive change!