Huge interface update!