diff --git a/package.json b/package.json
index 832446b..a507a69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swgoh-api-swgohgg",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "SWGoH helper API for swgoh.gg",
   "main": "index.js",
   "keywords": [
diff --git a/resources/toon_acronyms.json b/resources/toon_acronyms.json
index 377290a..65c4bfe 100644
--- a/resources/toon_acronyms.json
+++ b/resources/toon_acronyms.json
@@ -1,634 +1,586 @@
-[
-	{
-		"acronym": "3pac",
-		"name": "Threepio & Chewie"
-	},
-	{
-		"acronym": "5s",
-		"name": "CT-5555 \"Fives\""
-	},
-	{
-		"acronym": "aa",
-		"name": "Admiral Ackbar"
-	},
-	{
-		"acronym": "arc",
-		"name": "ARC Trooper"
-	},
-	{
-		"acronym": "atf",
-		"name": "Ahsoka Tano (Fulcrum)"
-	},
-	{
-		"acronym": "av",
-		"name": "Asajj Ventress"
-	},
-	{
-		"acronym": "bf",
-		"name": "Boba Fett"
-	},
-	{
-		"acronym": "boba",
-		"name": "Boba Fett"
-	},
-	{
-		"acronym": "bs",
-		"name": "Bastila Shan"
-	},
-	{
-		"acronym": "bsf",
-		"name": "Bastila Shan (Fallen)"
-	},
-	{
-		"acronym": "chs",
-		"name": "Captain Han Solo"
-	},
-	{
-		"acronym": "cls",
-		"name": "Commander Luke Skywalker"
-	},
-	{
-		"acronym": "cup",
-		"name": "Coruscant Underworld Police"
-	},
-	{
-		"acronym": "malak",
-		"name": "Darth Malak"
-	},
-	{
-		"acronym": "dn",
-		"name": "Darth Nihilus"
-	},
-	{
-		"acronym": "dr",
-		"name": "Darth Revan"
-	},
-	{
-		"acronym": "ds",
-		"name": "Darth Sion"
-	},
-	{
-		"acronym": "dt",
-		"name": "Death Trooper"
-	},
-	{
-		"acronym": "dv",
-		"name": "Darth Vader"
-	},
-	{
-		"acronym": "ep",
-		"name": "Emperor Palpatine"
-	},
-	{
-		"acronym": "foe",
-		"name": "First Order Executioner"
-	},
-	{
-		"acronym": "foo",
-		"name": "First Order Officer"
-	},
-	{
-		"acronym": "fosftp",
-		"name": "First Order Special Forces TIE Pilot"
-	},
-	{
-		"acronym": "fost",
-		"name": "First Order Stormtrooper"
-	},
-	{
-		"acronym": "fotf",
-		"name": "First Order TIE Fighter"
-	},
-	{
-		"acronym": "fotp",
-		"name": "First Order TIE Pilot"
-	},
-	{
-		"acronym": "gas",
-		"name": "General Skywalker"
-	},
-	{
-		"acronym": "gat",
-		"name": "Grand Admiral Thrawn"
-	},
-	{
-		"acronym": "gg",
-		"name": "General Grievous"
-	},
-	{
-		"acronym": "gk",
-		"name": "General Kenobi"
-	},
-	{
-		"acronym": "gmt",
-		"name": "Grand Moff Tarkin"
-	},
-	{
-		"acronym": "gmy",
-		"name": "Grand Master Yoda"
-	},
-	{
-		"acronym": "hyoda",
-		"name": "Hermit Yoda"
-	},
-	{
-		"acronym": "jka",
-		"name": "Jedi Knight Anakin"
-	},
-	{
-		"acronym": "jkl",
-		"name": "Jedi Knight Luke Skywalker"
-	},
-	{
-		"acronym": "jkr",
-		"name": "Jedi Knight Revan"
-	},
-	{
-		"acronym": "jtr",
-		"name": "Rey (Jedi Training)"
-	},
-	{
-		"acronym": "kam",
-		"name": "Ki-Adi-Mundi"
-	},
-	{
-		"acronym": "kru",
-		"name": "Kylo Ren (Unmasked)"
-	},
-	{
-		"acronym": "mm",
-		"name": "Mon Mothma"
-	},
-	{
-		"acronym": "mt",
-		"name": "Mother Talzin"
-	},
-	{
-		"acronym": "ben",
-		"name": "Obi-Wan Kenobi (Old Ben)"
-	},
-	{
-		"acronym": "qgj",
-		"name": "Qui-Gon Jinn"
-	},
-	{
-		"acronym": "rolo",
-		"name": "Rebel Officer Leia Organa"
-	},
-	{
-		"acronym": "rt",
-		"name": "Resistance Trooper"
-	},
-	{
-		"acronym": "sht",
-		"name": "Shoretrooper"
-	},
-	{
-		"acronym": "set",
-		"name": "Sith Empire Trooper"
-	},
-	{
-		"acronym": "slkr",
-		"name": "Supreme Leader Kylo Ren"
-	},
-	{
-		"acronym": "snips",
-		"name": "Ahsoka"
-	},
-	{
-		"acronym": "sh",
-		"name": "Stormtrooper Han"
-	},
-	{
-		"acronym": "tfp",
-		"name": "TIE Fighter Pilot"
-	},
-	{
-		"acronym": "yolo",
-		"name": "Young Han Solo"
-	},
-	{
-		"acronym": "piett",
-		"name": "Admiral Piett"
-	},
-	{
-		"acronym": "b1",
-		"name": "B1 Battle Droid"
-	},
-	{
-		"acronym": "b2",
-		"name": "B2 Super Battle Droid"
-	},
-	{
-		"acronym": "brriss",
-		"name": "Barriss Offee"
-	},
-	{
-		"acronym": "biggs",
-		"name": "Biggs Darklighter "
-	},
-	{
-		"acronym": "3po",
-		"name": "C-3PO"
-	},
-	{
-		"acronym": "ordo",
-		"name": "Canderous Ordo"
-	},
-	{
-		"acronym": "phasma",
-		"name": "Captain Phasma"
-	},
-	{
-		"acronym": "carth",
-		"name": "Carth Onasi"
-	},
-	{
-		"acronym": "chipra",
-		"name": "Chief Chipra"
-	},
-	{
-		"acronym": "nebit",
-		"name": "Chief Nebit"
-	},
-	{
-		"acronym": "sergeant",
-		"name": "Clone SergeantPhase 1"
-	},
-	{
-		"acronym": "cwc",
-		"name": "Clone Wars Chewbacca"
-	},
-	{
-		"acronym": "dooku",
-		"name": "Count Dooku"
-	},
-	{
-		"acronym": "echo",
-		"name": "CT-21-0408 \"ECHO\""
-	},
-	{
-		"acronym": "rex",
-		"name": "CT-7567 \"Rex\""
-	},
-	{
-		"acronym": "dm",
-		"name": "Darth Maul"
-	},
-	{
-		"acronym": "sidious",
-		"name": "Darth Sidious"
-	},
-	{
-		"acronym": "traya",
-		"name": "Darth Traya"
-	},
-	{
-		"acronym": "elder",
-		"name": "Ewok Elder"
-	},
-	{
-		"acronym": "scout",
-		"name": "Ewok Scout"
-	},
-	{
-		"acronym": "ezra",
-		"name": "Ezra Bridger"
-	},
-	{
-		"acronym": "zeb",
-		"name": "Garazeb \"zeb\" Orrelios"
-	},
-	{
-		"acronym": "hux",
-		"name": "General Hux"
-	},
-	{
-		"acronym": "gba",
-		"name": "Geonosian Brood Alpha"
-	},
-	{
-		"acronym": "gs",
-		"name": "Geonosian Soldier"
-	},
-	{
-		"acronym": "spy",
-		"name": "Geonosian spy"
-	},
-	{
-		"acronym": "greef",
-		"name": "Greef Karga"
-	},
-	{
-		"acronym": "hs",
-		"name": "Han solo"
-	},
-	{
-		"acronym": "hera",
-		"name": "Hera Syndulla"
-	},
-	{
-		"acronym": "hk",
-		"name": "HK-47"
-	},
-	{
-		"acronym": "hrs",
-		"name": "Hoth Rebel Scout"
-	},
-	{
-		"acronym": "magna",
-		"name": "IG-100 MagnaGuard"
-	},
-	{
-		"acronym": "magnaguard",
-		"name": "IG-100 MagnaGuard"
-	},
-	{
-		"acronym": "isp",
-		"name": "Imperial Super command"
-	},
-	{
-		"acronym": "jf",
-		"name": "Jango Fett"
-	},
-	{
-		"acronym": "jango",
-		"name": "Jango Fett"
-	},
-	{
-		"acronym": "scavanger",
-		"name": "Jawa Scavanger"
-	},
-	{
-		"acronym": "consul",
-		"name": "Jedi Consul"
-	},
-	{
-		"acronym": "jolee",
-		"name": "Jolee Bindo"
-	},
-	{
-		"acronym": "kanan",
-		"name": "Kanan Jarrus"
-	},
-	{
-		"acronym": "lando",
-		"name": "Lando Calrissian"
-	},
-	{
-		"acronym": "lsf",
-		"name": "Luke Skywalker (Farmboy)"
-	},
-	{
-		"acronym": "luminara",
-		"name": "Luminara Unduli"
-	},
-	{
-		"acronym": "mission",
-		"name": "Mission Vao"
-	},
-	{
-		"acronym": "me",
-		"name": "Mob Enforcer"
-	},
-	{
-		"acronym": "initiate",
-		"name": "NightSister Initiate"
-	},
-	{
-		"acronym": "zombie",
-		"name": "NightSister Zombie"
-	},
-	{
-		"acronym": "spirit",
-		"name": "NightSister Spirit"
-	},
-	{
-		"acronym": "nute",
-		"name": "Nute Gunray"
-	},
-	{
-		"acronym": "daka",
-		"name": "Old Daka"
-	},
-	{
-		"acronym": "padme",
-		"name": "Padmé Amidala"
-	},
-	{
-		"acronym": "poggle",
-		"name": "Poggle the lesser"
-	},
-	{
-		"acronym": "leia",
-		"name": "Princess Leia"
-	},
-	{
-		"acronym": "r2d2",
-		"name": "r2-d2"
-	},
-	{
-		"acronym": "ref",
-		"name": "resistence hero finn"
-	},
-	{
-		"acronym": "rep",
-		"name": "resistence hero poe"
-	},
-	{
-		"acronym": "rp",
-		"name": "resistence pilot"
-	},
-	{
-		"acronym": "sabine",
-		"name": "Sabine Wren"
-	},
-	{
-		"acronym": "marauder",
-		"name": "sith marauder"
-	},
-	{
-		"acronym": "sm",
-		"name": "sith marauder"
-	},
-	{
-		"acronym": "st",
-		"name": "Sith Trooper"
-	},
-	{
-		"acronym": "mandalorian",
-		"name": "The Mandalorian"
-	},
-	{
-		"acronym": "tie pilot",
-		"name": "Tie fighter Pilot"
-	},
-	{
-		"acronym": "tfp",
-		"name": "Tie fighter Pilot"
-	},
-	{
-		"acronym": "shaman",
-		"name": "Tusken Shaman"
-	},
-	{
-		"acronym": "wedge",
-		"name": "wedge antilles"
-	},
-	{
-		"acronym": "ylando",
-		"name": "young lando calrissian"
-	},
-	{
-		"acronym": "cody",
-		"name": "CC-2224 \"Cody\""
-	},
-	{
-		"acronym": "veers",
-		"name": "General Veers"
-	},
-	{
-		"acronym": "poe",
-		"name": "General Poe"
-	},
-	{
-		"acronym": "hrsr",
-		"name": "Hoth rebel soldier"
-	},
-	{
-		"acronym": "ig-86",
-		"name": "ig-86 sentinel droid"
-	},
-	{
-		"acronym": "jkg",
-		"name": "jedi knight guardian"
-	},
-	{
-		"acronym": "savage",
-		"name": "Savage Opress"
-	},
-	{
-		"acronym": "srp",
-		"name": "scarif rebel pathfinder"
-	},
-	{
-		"acronym": "rrr",
-		"name": "Urorrur'r'r"
-	},
-	{
-		"acronym": "zam",
-		"name": "zam wesell"
-	},
-	{
-		"acronym": "cassian",
-		"name": "cassian andor"
-	},
-	{
-		"acronym": "aayla",
-		"name": "aayla secura"
-	},
-	{
-		"acronym": "holdo",
-		"name": "amilyn holdo"
-	},
-	{
-		"acronym": "aurra",
-		"name": "aurra sing"
-	},
-	{
-		"acronym": "baze",
-		"name": "baze malbus"
-	},
-	{
-		"acronym": "chewie",
-		"name": "chewbacca"
-	},
-	{
-		"acronym": "chirrut",
-		"name": "chirrut imwe"
-	},
-	{
-		"acronym": "starck",
-		"name": "Colonel starck"
-	},
-	{
-		"acronym": "krennic",
-		"name": "director krennic"
-	},
-	{
-		"acronym": "enfys",
-		"name": "Enfys Nest"
-	},
-	{
-		"acronym": "nest",
-		"name": "Enfys Nest"
-	},
-	{
-		"acronym": "ipd",
-		"name": "imperial probe droid"
-	},
-	{
-		"acronym": "probe droid",
-		"name": "imperial probe droid"
-	},
-	{
-		"acronym": "engineer",
-		"name": "Jawa Engineer"
-	},
-	{
-		"acronym": "jyn",
-		"name": "Jyn erso"
-	},
-	{
-		"acronym": "kylo",
-		"name": "kylo ren"
-	},
-	{
-		"acronym": "acolyte",
-		"name": "NS acolyte"
-	},
-	{
-		"acronym": "reys",
-		"name": "rey scavanger"
-	},
-	{
-		"acronym": "rs",
-		"name": "rey scavanger"
-	},
-	{
-		"acronym": "sa",
-		"name": "sith assasin"
-	},
-	{
-		"acronym": "assasin",
-		"name": "sith assasin"
-	},
-	{
-		"acronym": "vc",
-		"name": "veteran chewbacca"
-	},
-	{
-		"acronym": "vsc",
-		"name": "veteran smuggler chewbacca"
-	},
-	{
-		"acronym": "vshs",
-		"name": "veteran smuggler han solo"
-	},
-	{
-		"acronym": "wat",
-		"name": "wat tambor"
-	},
-	{
-		"acronym": "jml",
-		"name": "jedi master luke skywalker"
-	},
-	{
-		"acronym": "jmls",
-		"name": "jedi master luke skywalker"
-	},
-	{
-		"acronym": "h1",
-		"name": "Home One"
-	}
-]
\ No newline at end of file
+{
+	"chars": [
+		{
+			"acronym": "3pac",
+			"name": "Threepio & Chewie"
+		},
+		{
+			"acronym": "3po",
+			"name": "C-3PO"
+		},
+		{
+			"acronym": "5s",
+			"name": "CT-5555 \"Fives\""
+		},
+		{
+			"acronym": "aa",
+			"name": "Admiral Ackbar"
+		},
+		{
+			"acronym": "arc",
+			"name": "ARC Trooper"
+		},
+		{
+			"acronym": "atf",
+			"name": "Ahsoka Tano (Fulcrum)"
+		},
+		{
+			"acronym": "av",
+			"name": "Asajj Ventress"
+		},
+		{
+			"acronym": "b1",
+			"name": "B1 Battle Droid"
+		},
+		{
+			"acronym": "b2",
+			"name": "B2 Super Battle Droid"
+		},
+		{
+			"acronym": "ben",
+			"name": "Obi-Wan Kenobi (Old Ben)"
+		},
+		{
+			"acronym": "bf",
+			"name": "Boba Fett"
+		},
+		{
+			"acronym": "briss",
+			"name": "Barriss Offee"
+		},
+		{
+			"acronym": "bs",
+			"name": "Bastila Shan"
+		},
+		{
+			"acronym": "bsf",
+			"name": "Bastila Shan (Fallen)"
+		},
+		{
+			"acronym": "chewie",
+			"name": "chewbacca"
+		},
+		{
+			"acronym": "chs",
+			"name": "Captain Han Solo"
+		},
+		{
+			"acronym": "cls",
+			"name": "Commander Luke Skywalker"
+		},
+		{
+			"acronym": "cup",
+			"name": "Coruscant Underworld Police"
+		},
+		{
+			"acronym": "cwc",
+			"name": "Clone Wars Chewbacca"
+		},
+		{
+			"acronym": "dm",
+			"name": "Darth Maul"
+		},
+		{
+			"acronym": "dn",
+			"name": "Darth Nihilus"
+		},
+		{
+			"acronym": "dr",
+			"name": "Darth Revan"
+		},
+		{
+			"acronym": "ds",
+			"name": "Darth Sion"
+		},
+		{
+			"acronym": "dt",
+			"name": "Death Trooper"
+		},
+		{
+			"acronym": "dv",
+			"name": "Darth Vader"
+		},
+		{
+			"acronym": "ep",
+			"name": "Emperor Palpatine"
+		},
+		{
+			"acronym": "foe",
+			"name": "First Order Executioner"
+		},
+		{
+			"acronym": "foo",
+			"name": "First Order Officer"
+		},
+		{
+			"acronym": "fosftp",
+			"name": "First Order SF TIE Pilot"
+		},
+		{
+			"acronym": "fost",
+			"name": "First Order Stormtrooper"
+		},
+		{
+			"acronym": "fotp",
+			"name": "First Order TIE Pilot"
+		},
+		{
+			"acronym": "gas",
+			"name": "General Skywalker"
+		},
+		{
+			"acronym": "gat",
+			"name": "Grand Admiral Thrawn"
+		},
+		{
+			"acronym": "gba",
+			"name": "Geonosian Brood Alpha"
+		},
+		{
+			"acronym": "gg",
+			"name": "General Grievous"
+		},
+		{
+			"acronym": "gk",
+			"name": "General Kenobi"
+		},
+		{
+			"acronym": "gmt",
+			"name": "Grand Moff Tarkin"
+		},
+		{
+			"acronym": "gmy",
+			"name": "Grand Master Yoda"
+		},
+		{
+			"acronym": "gs",
+			"name": "Geonosian Soldier"
+		},
+		{
+			"acronym": "hk",
+			"name": "HK-47"
+		},
+		{
+			"acronym": "hrs",
+			"name": "Hoth Rebel Scout"
+		},
+		{
+			"acronym": "hrsr",
+			"name": "Hoth rebel soldier"
+		},
+		{
+			"acronym": "hs",
+			"name": "Han Solo"
+		},
+		{
+			"acronym": "hyoda",
+			"name": "Hermit Yoda"
+		},
+		{
+			"acronym": "ig-86",
+			"name": "ig-86 sentinel droid"
+		},
+		{
+			"acronym": "ipd",
+			"name": "Imperial Probe Droid"
+		},
+		{
+			"acronym": "isp",
+			"name": "Imperial Super commando"
+		},
+		{
+			"acronym": "jf",
+			"name": "Jango Fett"
+		},
+		{
+			"acronym": "jka",
+			"name": "Jedi Knight Anakin"
+		},
+		{
+			"acronym": "jkg",
+			"name": "jedi knight guardian"
+		},
+		{
+			"acronym": "jkl",
+			"name": "Jedi Knight Luke Skywalker"
+		},
+		{
+			"acronym": "jkr",
+			"name": "Jedi Knight Revan"
+		},
+		{
+			"acronym": "jml",
+			"name": "jedi master luke skywalker"
+		},
+		{
+			"acronym": "jtr",
+			"name": "Rey (Jedi Training)"
+		},
+		{
+			"acronym": "kam",
+			"name": "Ki-Adi-Mundi"
+		},
+		{
+			"acronym": "kru",
+			"name": "Kylo Ren (Unmasked)"
+		},
+		{
+			"acronym": "kylo",
+			"name": "kylo ren"
+		},
+		{
+			"acronym": "leia",
+			"name": "Princess Leia"
+		},
+		{
+			"acronym": "lsf",
+			"name": "Luke Skywalker (Farmboy)"
+		},
+		{
+			"acronym": "magna",
+			"name": "IG-100 MagnaGuard"
+		},
+		{
+			"acronym": "magnaguard",
+			"name": "IG-100 MagnaGuard"
+		},
+		{
+			"acronym": "mando",
+			"name": "The Mandalorian"
+		},
+		{
+			"acronym": "me",
+			"name": "Mob Enforcer"
+		},
+		{
+			"acronym": "mm",
+			"name": "Mon Mothma"
+		},
+		{
+			"acronym": "mt",
+			"name": "Mother Talzin"
+		},
+		{
+			"acronym": "padme",
+			"name": "Padmé Amidala"
+		},
+		{
+			"acronym": "poe",
+			"name": "General Poe"
+		},
+		{
+			"acronym": "qgj",
+			"name": "Qui-Gon Jinn"
+		},
+		{
+			"acronym": "r2d2",
+			"name": "r2-d2"
+		},
+		{
+			"acronym": "ref",
+			"name": "resistence hero finn"
+		},
+		{
+			"acronym": "rep",
+			"name": "resistence hero poe"
+		},
+		{
+			"acronym": "reys",
+			"name": "rey scavanger"
+		},
+		{
+			"acronym": "rs",
+			"name": "rey scavanger"
+		},
+		{
+			"acronym": "rolo",
+			"name": "Rebel Officer Leia Organa"
+		},
+		{
+			"acronym": "rp",
+			"name": "resistence pilot"
+		},	
+		{
+			"acronym": "rrr",
+			"name": "Urorrur'r'r"
+		},
+		{
+			"acronym": "rt",
+			"name": "Resistance Trooper"
+		},
+		{
+			"acronym": "sa",
+			"name": "sith assasin"
+		},
+		{
+			"acronym": "scavenger",
+			"name": "Jawa Scavanger"
+		},
+		{
+			"acronym": "scout",
+			"name": "Ewok scout"
+		},
+		{
+			"acronym": "see",
+			"name": "Sith Eternal Emperor"
+		},
+		{
+			"acronym": "set",
+			"name": "Sith Empire Trooper"
+		},
+		{
+			"acronym": "sh",
+			"name": "Stormtrooper Han"
+		},
+		{
+			"acronym": "sht",
+			"name": "Shoretrooper"
+		},
+		{
+			"acronym": "slkr",
+			"name": "Supreme Leader Kylo Ren"
+		},
+		{
+			"acronym": "sm",
+			"name": "sith marauder"
+		},
+		{
+			"acronym": "snips",
+			"name": "Ahsoka"
+		},
+		{
+			"acronym": "spy",
+			"name": "Geonosian spy"
+		},
+		{
+			"acronym": "srp",
+			"name": "scarif rebel pathfinder"
+		},
+		{
+			"acronym": "st",
+			"name": "Sith Trooper"
+		},
+		{
+			"acronym": "tfp",
+			"name": "TIE Fighter Pilot"
+		},
+		{
+			"acronym": "tie pilot",
+			"name": "Tie fighter Pilot"
+		},
+		{
+			"acronym": "vc",
+			"name": "veteran chewbacca"
+		},
+		{
+			"acronym": "vsc",
+			"name": "veteran smuggler chewbacca"
+		},
+		{
+			"acronym": "vshs",
+			"name": "veteran smuggler han solo"
+		},
+		{
+			"acronym": "wat",
+			"name": "wat tambor"
+		},
+		{
+			"acronym": "ylando",
+			"name": "young lando calrissian"
+		},
+		{
+			"acronym": "yolo",
+			"name": "Young Han Solo"
+		}
+	],
+	"ships": [
+		{
+			"acronym": "H1",
+			"name": "Home One"
+		},
+		{
+			"acronym": "HT",
+			"name": "Hound's Tooth"
+		},
+		{
+			"acronym": "XB",
+			"name": "Xanadu Blood"
+		},
+		{
+			"acronym": "JCTF",
+			"name": "jedi consular's starfighter"
+		},
+		{
+			"acronym": "PKSF",
+			"name": "plo koon's jedi starfighter"
+		},
+		{
+			"acronym": "GRYW",
+			"name": "btl-b y-wing starfighter"
+		},
+		{
+			"acronym": "ASF",
+			"name": "anakin's eta-2 starfighter"
+		},
+		{
+			"acronym": "eta",
+			"name": "anakin's eta-2 starfighter"
+		},
+		{
+			"acronym": "USF",
+			"name": "Umbaran Starfighter"
+		},
+		{
+			"acronym": "ATSF",
+			"name": "ahsoka tano's jedi starfighter"
+		},
+		{
+			"acronym": "TIEA",
+			"name": "Tie advanced x1"
+		},
+		{
+			"acronym": "TA",
+			"name": "Tie advanced x1"
+		},
+		{
+			"acronym": "GSPYSF",
+			"name": "geonosian spy starfighter"
+		},
+		{
+			"acronym": "ITF",
+			"name": "imperial TIE fighter"
+		},
+		{
+			"acronym": "GSST",
+			"name": "geonosian soldier starfighter"
+		},
+		{
+			"acronym": "SFGSF",
+			"name": "sun fac geonosian starfighter"
+		},
+		{
+			"acronym": "Phantom",
+			"name": "phantom II"
+		},
+		{
+			"acronym": "BDXW",
+			"name": "biggs Darklighter's x-wing"
+		},
+		{
+			"acronym": "WAXW",
+			"name": "wedge Antilles's x-wing"
+		},
+		{
+			"acronym": "RYW",
+			"name": "rebel y-wing"
+		},
+		{
+			"acronym": "CSARC",
+			"name": "clone sergeant's arc-170"
+		},
+		{
+			"acronym": "LMILF",
+			"name": "lando's millenium falcon"
+		},
+		{
+			"acronym": "RXW",
+			"name": "resistence x-wing"
+		},
+		{
+			"acronym": "Vulture",
+			"name": "vulture Droid"
+		},
+		{
+			"acronym": "ECB",
+			"name": "b-28 extinction-class bomber"
+		},
+		{
+			"acronym": "FOTF",
+			"name": "First Order tie fighter"
+		},
+		{
+			"acronym": "GSF",
+			"name": "gauntlet starfighter"
+		},
+		{
+			"acronym": "Quimera",
+			"name": "chimaera"
+		},
+		{
+			"acronym": "Nego",
+			"name": "negotiator"
+		},
+		{
+			"acronym": "FOSFTF",
+			"name": "first order sf tie fighter"
+		},
+		{
+			"acronym": "CUW",
+			"name": "cassian's u-wing"
+		},
+		{
+			"acronym": "Hyena",
+			"name": "hyena bomber"
+		},
+		{
+			"acronym": "KRCS",
+			"name": "kylo ren's command shuttle"
+		},
+		{
+			"acronym": "shuttle",
+			"name": "kylo ren's command shuttle"
+		},
+		{
+			"acronym": "PXW",
+			"name": "poe x ing"
+		},
+		{
+			"acronym": "ITB",
+			"name": "imperial tie bomber"
+		},
+		{
+			"acronym": "TS",
+			"name": "tie silencer"
+		},
+		{
+			"acronym": "silencer",
+			"name": "tie silencer"
+		},
+		{
+			"acronym": "EPS",
+			"name": "emperor's shuttle"
+		},
+		{
+			"acronym": "TR",
+			"name": "tie reaper"
+		},
+		{
+			"acronym": "TIER",
+			"name": "tie reaper"
+		},
+		{
+			"acronym": "RARC",
+			"name": "rex's arc-170"
+		},
+		{
+			"acronym": "ARC",
+			"name": "rex's arc-170"
+		},
+		{
+			"acronym": "RMILF",
+			"name": "rey's millenium falcon"
+		},
+		{
+			"acronym": "BUW",
+			"name": "bistan's u-wing"
+		},
+		{
+			"acronym": "MILF",
+			"name": "Han's millenium falcon"
+		},
+		{
+			"acronym": "MF",
+			"name": "Han's millenium falcon"
+		}
+	]
+}
\ No newline at end of file
diff --git a/swgohgg-api.js b/swgohgg-api.js
index a420032..8727ca4 100644
--- a/swgohgg-api.js
+++ b/swgohgg-api.js
@@ -419,12 +419,14 @@ class SwgohGGApi {
         var tempAcronyms = JSON.parse(fs.readFileSync(fileName, 'utf8'));
 
         // create new acronym map
-        const acronyms = new Map();
+        const acronyms = {
+            chars: new Map(),
+            ships: new Map()
+        };
 
-        // add entries to map
-        tempAcronyms.forEach(acronym => {
-            acronyms.set(acronym.acronym, acronym.name);
-        });
+        // add entries to maps
+        tempAcronyms.chars.forEach(acronym => acronyms.chars.set(acronym.acronym.toLowerCase(), acronym.name));
+        tempAcronyms.ships.forEach(acronym => acronyms.ships.set(acronym.acronym.toLowerCase(), acronym.name));
 
         return acronyms;
     }
@@ -818,9 +820,9 @@ class SwgohGGApi {
         var searchName = name.toLowerCase();
 
         // test for acronym
-        if (this.acronyms.has(searchName)) {
+        if (this.acronyms.chars.has(searchName)) {
             // set new search name to acronym mapping
-            searchName = this.acronyms.get(searchName).toLowerCase();
+            searchName = this.acronyms.chars.get(searchName).toLowerCase();
 
             if (this.logger) this.logger.debug(`findCharacter@swgohgg-api: mapped "${name}" to "${searchName}"`);
         }
@@ -868,9 +870,9 @@ class SwgohGGApi {
         var searchName = name.toLowerCase();
 
         // test for acronym
-        if (this.acronyms.has(searchName)) {
+        if (this.acronyms.ships.has(searchName)) {
             // set new search name to acronym mapping
-            searchName = this.acronyms.get(searchName).toLowerCase();
+            searchName = this.acronyms.ships.get(searchName).toLowerCase();
 
             if (this.logger) this.logger.debug(`findShip@swgohgg-api: mapped "${name}" to "${searchName}"`);
         }
diff --git a/test/swgohgg-api.test.js b/test/swgohgg-api.test.js
index 1d00f43..6911440 100644
--- a/test/swgohgg-api.test.js
+++ b/test/swgohgg-api.test.js
@@ -13,7 +13,8 @@ describe('Static methods', () => {
         const acronyms = SwgohGGApi.loadAcronyms('./resources/toon_acronyms.json');
 
         assert.strictEqual(typeof acronyms, "object");
-        assert.strictEqual(acronyms.size > 0, true);
+        assert.strictEqual(acronyms.chars.size > 0, true);
+        assert.strictEqual(acronyms.ships.size > 0, true);
     });
 
     it ('getUnitTypeCount/getCharacterCount/getShipCount', () => {