diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp
index 86ce4083df..448a57da61 100644
--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@@ -158,12 +158,13 @@ namespace MWLua
         api["magic"] = initCoreMagicBindings(context);
         api["stats"] = initCoreStatsBindings(context);
 
+        sol::table character(lua->sol(), sol::create);
         initCoreFactionBindings(context);
-        api["factions"] = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>();
+        character["factions"] = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>();
 
         initCoreClassBindings(context);
-        api["classes"] = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>();
-
+        character["classes"] = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Class>();
+        api["character"] = character;
         api["l10n"] = LuaUtil::initL10nLoader(lua->sol(), MWBase::Environment::get().getL10nManager());
         const MWWorld::Store<ESM::GameSetting>* gmstStore
             = &MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>();
diff --git a/files/lua_api/openmw/core.lua b/files/lua_api/openmw/core.lua
index 19bbb2a750..05daf424c8 100644
--- a/files/lua_api/openmw/core.lua
+++ b/files/lua_api/openmw/core.lua
@@ -14,9 +14,12 @@
 -- A read-only list of all @{#FactionRecord}s in the world database.
 -- @field [parent=#core] #list<#FactionRecord> factions
 
+--- @{#Character}: Class and Character Data
+-- @field [parent=#core] #Character character
+
 ---
 -- A read-only list of all @{#ClassRecord}s in the world database.
--- @field [parent=#core] #list<#ClassRecord> classes
+-- @field [parent=#Character] #list<#ClassRecord> classes
 
 ---
 -- Terminates the game and quits to the OS. Should be used only for testing purposes.