Improve interface

Change some code in the interface class to be improve.