Refactored to new Kappa:Framework