Add AdminResolver WIP