Revert "refactoring interface"

This reverts commit 9dc54c3c2500bcc5cf0f965e353f892e05d5de2e.