refactoring of classes, Axon key typed