Changed mapping
Added Kappa:Framework