Modernization of ALFI skeleton.