Refactored to last version Kappa/Framework