Refactoring MKD