Refactor the Key interfaces