Interface update and fix bugs