Update Basic Interface.

Some old macro is not fine.