diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index 23d753c3..168314f6 100644
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -356,6 +356,14 @@ REJECT_OLD_APIS = 'True' == os.environ.get('AA_REJECT_OLD_APIS', 'False')
 REJECT_OLD_APIS_MARGIN = os.environ.get('AA_REJECT_OLD_APIS_MARGIN', 50)
 API_SSO_VALIDATION = 'True' == os.environ.get('AA_API_SSO_VALIDATION', 'False')
 
+#######################
+# EVE Provider Settings
+#######################
+# EVEONLINE_DATA_PROVIDER - Name of default data source for getting eve entity data
+#                           Available soruces are 'esi' and 'xml'
+#######################
+EVEONLINE_DATA_PROVIDER = os.environ.get('AA_EVEONLINE_DATA_PROVIDER', 'esi')
+
 #####################
 # Alliance Market
 #####################
diff --git a/eveonline/migrations/0005_remove_eveallianceinfo_member_count.py b/eveonline/migrations/0005_remove_eveallianceinfo_member_count.py
new file mode 100644
index 00000000..f9a7bfab
--- /dev/null
+++ b/eveonline/migrations/0005_remove_eveallianceinfo_member_count.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-12-16 23:22
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eveonline', '0004_eveapikeypair_sso_verified'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='eveallianceinfo',
+            name='member_count',
+        ),
+    ]
diff --git a/eveonline/models.py b/eveonline/models.py
index 74b26d48..118ae305 100644
--- a/eveonline/models.py
+++ b/eveonline/models.py
@@ -38,7 +38,6 @@ class EveAllianceInfo(models.Model):
     alliance_ticker = models.CharField(max_length=254)
     executor_corp_id = models.CharField(max_length=254)
     is_blue = models.BooleanField(default=False)
-    member_count = models.IntegerField()
 
     def __str__(self):
         return self.alliance_name
diff --git a/eveonline/providers.py b/eveonline/providers.py
new file mode 100644
index 00000000..b33e7ba4
--- /dev/null
+++ b/eveonline/providers.py
@@ -0,0 +1,215 @@
+from django.utils.encoding import python_2_unicode_compatible
+from esi.clients import esi_client_factory
+from django.conf import settings
+import evelink
+
+@python_2_unicode_compatible
+class Entity(object):
+    def __init__(self, id, name):
+        self.id = id
+        self.name = name
+
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        return "<{} ({}): {}>".format(self.__class__.__name__, self.id, self.name)
+
+    def __bool__(self):
+        return bool(self.id)
+
+    def __eq__(self, other):
+        return self.id == other.id
+
+
+class Corporation(Entity):
+    def __init__(self, provider, id, name, ticker, ceo_id, members, alliance_id):
+        super(Corporation, self).__init__(id, name)
+        self.provider = provider
+        self.ticker = ticker
+        self.ceo_id = ceo_id
+        self.members = members
+        self.alliance_id = alliance_id
+
+    @property
+    def alliance(self):
+        if self.alliance_id:
+            return self.provider.get_alliance(self.alliance_id)
+        return Entity(None, None)
+
+    @property
+    def ceo(self):
+        return self.provider.get_character(self.ceo_id)
+
+
+class Alliance(Entity):
+    def __init__(self, provider, id, name, ticker, corp_ids):
+        super(Alliance, self).__init__(id, name)
+        self.provider = provider
+        self.ticker = ticker
+        self.corp_ids = corp_ids
+
+    def corp(self, id):
+        assert id in self.corp_ids
+        return self.provider.get_corp(id)
+
+    @property
+    def corps(self):
+        return sorted([self.corp(id) for id in self.corp_ids], key=lambda x: x.name)
+
+
+class Character(Entity):
+    def __init__(self, provider, id, name, corp_id, alliance_id):
+        super(Character, self).__init__(id, name)
+        self.provider = provider
+        self.corp_id = corp_id
+        self.alliance_id = alliance_id
+
+    @property
+    def corp(self):
+        return self.provider.get_corp(self.corp_id)
+
+    @property
+    def alliance(self):
+        if self.alliance_id:
+            return self.provider.get_alliance(self.alliance_id)
+        return Entity(None, None)
+
+
+class EveProvider:
+    def get_alliance(self, alliance_id):
+        """
+        :return: an Alliance object for the given ID
+        """
+        raise NotImplementedError()
+
+    def get_corp(self, corp_id):
+        """
+        :return: a Corporation object for the given ID
+        """
+        raise NotImplementedError()
+
+    def get_character(self, corp_id):
+        """
+        :return: a Character object for the given ID
+        """
+        raise NotImplementedError()
+
+
+class EveSwaggerProvider(EveProvider):
+    def __init__(self, token=None):
+        self.client = esi_client_factory(token=token)
+
+    def get_alliance(self, alliance_id):
+        data = self.client.Alliance.get_alliances_alliance_id(alliance_id=alliance_id).result()
+        corps = self.client.Alliance.get_alliances_alliance_id_corporations(alliance_id=alliance_id).result()
+        model = Alliance(
+            self,
+            alliance_id,
+            data['alliance_name'],
+            data['ticker'],
+            corps,
+        )
+        return model
+
+    def get_corp(self, corp_id):
+        data = self.client.Corporation.get_corporations_corporation_id(corporation_id=corp_id).result()
+        model = Corporation(
+            self,
+            corp_id,
+            data['corporation_name'],
+            data['ticker'],
+            data['ceo_id'],
+            data['member_count'],
+            data['alliance_id'] if 'alliance_id' in data else None,
+        )
+        return model
+
+    def get_character(self, character_id):
+        data = self.client.Character.get_characters_character_id(character_id=character_id).result()
+        alliance_id = self.get_corp(data['corporation_id']).alliance_id
+        model = Character(
+            self,
+            character_id,
+            data['name'],
+            data['corporation_id'],
+            alliance_id,
+        )
+        return model
+
+
+class EveXmlProvider(EveProvider):
+    def __init__(self, api_key=None):
+        """
+        :param api_key: eveonline.EveApiKeyPair
+        """
+        self.api = evelink.api.API(api_key=(api_key.api_id, api_key.api_key)) if api_key else evelink.api.API()
+        
+    def get_alliance(self, id):
+        api = evelink.eve.EVE(api=self.api)
+        alliances = api.alliances().result
+        results = alliances[int(id)]
+        model = Alliance(
+            self,
+            id,
+            results['name'],
+            results['ticker'],
+            results['member_corps'],
+        )
+        return model
+
+    def get_corp(self, id):
+        api = evelink.corp.Corp(api=self.api)
+        corpinfo = api.corporation_sheet(corp_id=int(id)).result
+        model = Corporation(
+            self,
+            id,
+            corpinfo['name'],
+            corpinfo['ceo']['id'],
+            corpinfo['members']['current'],
+            corpinfo['ticker'],
+            corpinfo['alliance']['id'] if corpinfo['alliance'] else None,
+        )
+        return model
+
+    def get_character(self, id):
+        api = evelink.eve.EVE(api=self.api)
+        charinfo = api.character_info_from_id(id).result
+        model = Character(
+            self,
+            id,
+            charinfo['name'],
+            charinfo['corp']['id'],
+            charinfo['alliance']['id'],
+        )
+        return model
+            
+
+
+class EveAdapter(EveProvider):
+    """
+    Redirects queries to appropriate data source.
+    """
+    def __init__(self, provider):
+        self.provider = provider
+
+    def __repr__(self):
+        return "<{} ({})>".format(self.__class__.__name__, self.provider.__class__.__name__)
+
+    def get_character(self, id):
+        return self.provider.get_character(id)
+
+    def get_corporation(self, id):
+        return self.provider.get_corporation(id)
+
+    def get_alliance(self, id):
+        return self.provider.get_alliance(id)
+
+
+def adapter_factory(source=settings.EVEONLINE_DATA_PROVIDER, **kwargs):
+    if source == 'xml':
+        return EveAdapter(EveXmlProvider(**kwargs))
+    elif source == 'esi':
+        return EveAdapter(EveSwaggerProvider(**kwargs))
+    else:
+        raise ValueError('Unrecognized data source.')