KeyBuilder refactoring #10