Huge interface update