Simplify the interfaces
Test #1 is passed.