Added some @Unowned annotations to prevent some errors later