Move AdminResolver to addon