am a471ebb0: Refactoring interface.

* commit 'a471ebb05c3c6f31102cd512d2b73ed9d74ac2d7':
  Refactoring interface.