diff --git a/README.md b/README.md
index 65cb01c..1509321 100644
--- a/README.md
+++ b/README.md
@@ -35,31 +35,31 @@ pnpm install al-quran-sdk
 
 Provides methods to fetch verses based on various criteria.
 
-#### `getVerseByChapter(chapter_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getVerseByChapter(chapter_number: string, query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches verses by chapter number.
 
-#### `getVerseByPage(page_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getVerseByPage(page_number: string, query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches verses by page number.
 
-#### `getVerseByJuz(juz_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getVerseByJuz(juz_number: string, query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches verses by Juz number.
 
-#### `getVerseByHizbNumber(hizb_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getVerseByHizbNumber(hizb_number: string, query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches verses by Hizb number.
 
-#### `getVerseByRubElHizbNumber(rub_el_hizb_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getVerseByRubElHizbNumber(rub_el_hizb_number: string, query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches verses by Rub el Hizb number.
 
-#### `getSpecificVerseByVerseKey(verse_key: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getSpecificVerseByVerseKey(verse_key: string, query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches a specific verse by its key.
 
-#### `getRandomAyah(query?: VerseQuery): Promise<VerseResponse | AxiosError | Error>`
+#### `getRandomAyah(query?: VerseQuery): Promise<VerseResponse>`
 
 Fetches a random verse.
 
@@ -67,39 +67,39 @@ Fetches a random verse.
 
 Provides methods to fetch resource information.
 
-#### `getRecitationInfo(recitation_id: string): Promise<RecitationInfo | Error | AxiosError>`
+#### `getRecitationInfo(recitation_id: string): Promise<RecitationInfo>`
 
 Fetches information about a specific recitation.
 
-#### `getTranslationInfo(translation_id: string): Promise<TranslationInfo | Error | AxiosError>`
+#### `getTranslationInfo(translation_id: string): Promise<TranslationInfo>`
 
 Fetches information about a specific translation.
 
-#### `getTranslations(language: string = 'en'): Promise<TranslationResponse | Error | AxiosError>`
+#### `getTranslations(language: string = 'en'): Promise<TranslationResponse>`
 
 Fetches translations based on language.
 
-#### `getTafsirs(language: string = 'en'): Promise<TafsirsResponse | Error | AxiosError>`
+#### `getTafsirs(language: string = 'en'): Promise<TafsirsResponse>`
 
 Fetches Tafsirs based on language.
 
-#### `getTafsirInfo(tafsir_id: string): Promise<TafsirInfoResponse | Error | AxiosError>`
+#### `getTafsirInfo(tafsir_id: string): Promise<TafsirInfoResponse>`
 
 Fetches information about a specific Tafsir.
 
-#### `getRecitationStyles(): Promise<RecitationStyleResponse | Error | AxiosError>`
+#### `getRecitationStyles(): Promise<RecitationStyleResponse>`
 
 Fetches available recitation styles.
 
-#### `getLanguages(): Promise<LanguageResponse | Error | AxiosError>`
+#### `getLanguages(): Promise<LanguageResponse>`
 
 Fetches available languages.
 
-#### `getChapterInfos(): Promise<ChapterInfos | Error | AxiosError>`
+#### `getChapterInfos(): Promise<ChapterInfos>`
 
 Fetches information about chapters.
 
-#### `getVerseMedias(): Promise<VerseMediaResponse | Error | AxiosError>`
+#### `getVerseMedias(): Promise<VerseMediaResponse>`
 
 Fetches media associated with verses.
 
@@ -107,39 +107,39 @@ Fetches media associated with verses.
 
 Provides methods to fetch Quranic text in various scripts.
 
-#### `getIndoPakScriptOfAyah(query?: QuranQuery): Promise<QuranResponse | AxiosError | Error>`
+#### `getIndoPakScriptOfAyah(query?: QuranQuery): Promise<QuranResponse>`
 
 Fetches the Indo-Pak script of an Ayah.
 
-#### `getUthmaniTajweedScriptOfAyah(query?: QuranQuery): Promise<UthmaniTajweedResponse | AxiosError | Error>`
+#### `getUthmaniTajweedScriptOfAyah(query?: QuranQuery): Promise<UthmaniTajweedResponse>`
 
 Fetches the Uthmani Tajweed script of an Ayah.
 
-#### `getUthmaniScriptOfAyah(query?: QuranQuery): Promise<UthmaniScriptResponse | AxiosError | Error>`
+#### `getUthmaniScriptOfAyah(query?: QuranQuery): Promise<UthmaniScriptResponse>`
 
 Fetches the Uthmani script of an Ayah.
 
-#### `getUthmaniSimpleScriptOfAyah(query?: QuranQuery): Promise<UthmaniSimpleScriptResponse | AxiosError | Error>`
+#### `getUthmaniSimpleScriptOfAyah(query?: QuranQuery): Promise<UthmaniSimpleScriptResponse>`
 
 Fetches the Uthmani simple script of an Ayah.
 
-#### `getImlaeiSimpleTextOfAyah(query?: QuranQuery): Promise<ImlaeiSimpleTextResponse | AxiosError | Error>`
+#### `getImlaeiSimpleTextOfAyah(query?: QuranQuery): Promise<ImlaeiSimpleTextResponse>`
 
 Fetches the Imlaei simple text of an Ayah.
 
-#### `getASingleTranslation(translation_id: string, query?: TranslationQuery): Promise<SingleTranslationResponse | AxiosError | Error>`
+#### `getASingleTranslation(translation_id: string, query?: TranslationQuery): Promise<SingleTranslationResponse>`
 
 Fetches a single translation.
 
-#### `getSingleTafsir(tafsir_id: string, query?: TranslationQuery): Promise<SingleTafsirResponse | AxiosError | Error>`
+#### `getSingleTafsir(tafsir_id: string, query?: TranslationQuery): Promise<SingleTafsirResponse>`
 
 Fetches a single Tafsir.
 
-#### `getGlyphCodesOfAyahV1(query?: QuranQuery): Promise<GlyphCodesOfAyahV1Response | AxiosError | Error>`
+#### `getGlyphCodesOfAyahV1(query?: QuranQuery): Promise<GlyphCodesOfAyahV1Response>`
 
 Fetches glyph codes of an Ayah (version 1).
 
-#### `getGlyphCodesOfAyahV2(query?: QuranQuery): Promise<GlyphCodesOfAyahV2Response | AxiosError | Error>`
+#### `getGlyphCodesOfAyahV2(query?: QuranQuery): Promise<GlyphCodesOfAyahV2Response>`
 
 Fetches glyph codes of an Ayah (version 2).
 
@@ -147,7 +147,7 @@ Fetches glyph codes of an Ayah (version 2).
 
 Provides methods to fetch information about Juz.
 
-#### `getAllJuzs(): Promise<JuzResponse | Error | AxiosError>`
+#### `getAllJuzs(): Promise<JuzResponse>`
 
 Fetches all Juz.
 
@@ -155,15 +155,15 @@ Fetches all Juz.
 
 Provides methods to fetch chapter information.
 
-#### `listChapters(language = 'en'): Promise<ListChapters | Error | AxiosError>`
+#### `listChapters(language = 'en'): Promise<ListChapters>`
 
 Fetches a list of chapters based on language.
 
-#### `getChapter(id: number, language = 'en'): Promise<Chapter | Error | AxiosError>`
+#### `getChapter(id: number, language = 'en'): Promise<Chapter>`
 
 Fetches information about a specific chapter.
 
-#### `getChapterInfo(chapter_id: number, language = 'en'): Promise<ChapterInfo | Error | AxiosError>`
+#### `getChapterInfo(chapter_id: number, language = 'en'): Promise<ChapterInfo>`
 
 Fetches detailed information about a specific chapter.
 
@@ -171,47 +171,47 @@ Fetches detailed information about a specific chapter.
 
 Provides methods to fetch audio recitations and related data.
 
-#### `getChaptersAudioOfAReciter(id: number, chapter_number: number): Promise<IAudio | Error | AxiosError>`
+#### `getChaptersAudioOfAReciter(id: number, chapter_number: number): Promise<IAudio>`
 
 Fetches audio recordings of a specific chapter by a particular reciter.
 
-#### `getAllChaptersAudioOfAReciter(id: number): Promise<IListOfAllAudioOfAReciter | Error | AxiosError>`
+#### `getAllChaptersAudioOfAReciter(id: number): Promise<IListOfAllAudioOfAReciter>`
 
 Fetches all chapter recordings by a specific reciter.
 
-#### `getRecitations(language: string = 'en'): Promise<IRecitation | Error | AxiosError>`
+#### `getRecitations(language: string = 'en'): Promise<IRecitation>`
 
 Fetches recitations based on language.
 
-#### `getAllAudioFilesofARecitation(recitation_id: number, query?: AudioQueryParams): Promise<ISingleRecitation | Error | AxiosError>`
+#### `getAllAudioFilesofARecitation(recitation_id: number, query?: AudioQueryParams): Promise<ISingleRecitation>`
 
 Fetches all audio files of a specific recitation.
 
-#### `getListOfChapterReciters(language: string = 'en'): Promise<IReciters | Error | AxiosError>`
+#### `getListOfChapterReciters(language: string = 'en'): Promise<IReciters>`
 
 Fetches a list of chapter reciters based on language.
 
-#### `getAyahRecitationsForSpecificSurah(recitation_id: number, chapter_number: number): Promise<IAyahRecitationSpecificSurah | Error | AxiosError>`
+#### `getAyahRecitationsForSpecificSurah(recitation_id: number, chapter_number: number): Promise<IAyahRecitationSpecificSurah>`
 
 Fetches Ayah recitations for a specific Surah.
 
-#### `getAyahRecitationsForSpecificJuz(recitation_id: number, juz_number: number): Promise<IAyahRecitationSpecificJuz | Error | AxiosError>`
+#### `getAyahRecitationsForSpecificJuz(recitation_id: number, juz_number: number): Promise<IAyahRecitationSpecificJuz>`
 
 Fetches Ayah recitations for a specific Juz.
 
-#### `getAyahRecitationForSpecificMadaniMushafPage(recitation_id: number, page_number: number): Promise<IAyahRecitationSpecificMadaniMushafPage | Error | AxiosError>`
+#### `getAyahRecitationForSpecificMadaniMushafPage(recitation_id: number, page_number: number): Promise<IAyahRecitationSpecificMadaniMushafPage>`
 
 Fetches Ayah recitations for a specific Madani Mushaf page.
 
-#### `getAyahRecitationForSpecificRubelHizb(recitation_id: number, rub_el_hizb_number: number): Promise<IAyahRecitationSpecificRubelHizb | Error | AxiosError>`
+#### `getAyahRecitationForSpecificRubelHizb(recitation_id: number, rub_el_hizb_number: number): Promise<IAyahRecitationSpecificRubelHizb>`
 
 Fetches Ayah recitations for a specific Rub el Hizb.
 
-#### `getAyahRecitationForSpecificHizb(recitation_id: number, hizb_number: number): Promise<IAyahRecitationSpecificHizb | Error | AxiosError>`
+#### `getAyahRecitationForSpecificHizb(recitation_id: number, hizb_number: number): Promise<IAyahRecitationSpecificHizb>`
 
 Fetches Ayah recitations for a specific Hizb.
 
-#### `getAyahRecitationForSpecificAyah(recitation_id: number, ayah_key: string): Promise<IAyahRecitationSpecificAyah | Error | AxiosError>`
+#### `getAyahRecitationForSpecificAyah(recitation_id: number, ayah_key: string): Promise<IAyahRecitationSpecificAyah>`
 
 Fetches Ayah recitations for a specific Ayah.
 
diff --git a/package.json b/package.json
index 998e85b..140315b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "al-quran-sdk",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "An API wrapper for Quran on top of quran.com",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/src/apis/audio.ts b/src/apis/audio.ts
index 5e85801..d3ad106 100644
--- a/src/apis/audio.ts
+++ b/src/apis/audio.ts
@@ -1,16 +1,19 @@
-import { AxiosError } from "axios";
 import url from "url";
-import Api from "../req";
+import { AudioError, LanguageValidationError } from "../errors";
 import {
+    ALLOWED_LANGUAGES,
     AudioApi, AudioQueryParams,
-    IAudio, IListOfAllAudioOfAReciter, IRecitation,
-    ISingleRecitation, IReciters, IAyahRecitationSpecificSurah, IAyahRecitationSpecificJuz,
+    IAudio,
+    IAyahRecitationSpecificAyah,
+    IAyahRecitationSpecificHizb,
+    IAyahRecitationSpecificJuz,
     IAyahRecitationSpecificMadaniMushafPage, IAyahRecitationSpecificRubelHizb,
-    IAyahRecitationSpecificHizb, IAyahRecitationSpecificAyah, ALLOWED_LANGUAGES
-} from "../types";
-import { handleError, handleResponse } from "../utils";
-
-const api = Api();
+    IAyahRecitationSpecificSurah,
+    IListOfAllAudioOfAReciter, IRecitation,
+    IReciters,
+    ISingleRecitation
+} from "../interfaces";
+import { apiWraper } from "../utils";
 
 
 export const audio: AudioApi = {
@@ -23,15 +26,10 @@ export const audio: AudioApi = {
     * @returns A promise that resolves to the audio recordings or rejects with an error.
     * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/chapter-reciter-audio-file}
     */
-    getChaptersAudioOfAReciter(id: number, chapter_number: number): Promise<IAudio | Error | AxiosError> {
+    async getChaptersAudioOfAReciter(id: number, chapter_number: number): Promise<IAudio> {
         if (!id || !chapter_number)
-            return Promise.reject(new Error('Reciter\'s ID and Chapter number is required'));
-
-        return new Promise((resolve, reject) => {
-            api.get(`/chapter_recitations/${id}/${chapter_number}`,)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('Reciter\'s ID and Chapter number is required');
+        return await apiWraper<IAudio>(`/chapter_recitations/${id}/${chapter_number}`);
     },
 
     /**
@@ -41,15 +39,10 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the list of audio recordings or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/chapter-reciter-audio-files}
      */
-    getAllChaptersAudioOfAReciter(id: number): Promise<IListOfAllAudioOfAReciter | Error | AxiosError> {
+    async getAllChaptersAudioOfAReciter(id: number): Promise<IListOfAllAudioOfAReciter> {
         if (!id)
-            return Promise.reject(new Error('Reciter\'s ID is required'));
-
-        return new Promise((resolve, reject) => {
-            api.get(`/chapter_recitations/${id}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('Reciter\'s ID is required');
+        return await apiWraper<IListOfAllAudioOfAReciter>(`/chapter_recitations/${id}`);
     },
 
     /**
@@ -59,14 +52,10 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the list of recitations or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/recitations}
      */
-    getRecitations(language: string = 'en'): Promise<IRecitation | Error | AxiosError> {
+    async getRecitations(language: string = 'en'): Promise<IRecitation> {
         const isLanguageSupported = ALLOWED_LANGUAGES.has(language);
-        if (!isLanguageSupported) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/languages?${new url.URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+        if (!isLanguageSupported) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<IRecitation>(`/resources/languages?${new url.URLSearchParams({ language })}`);
     },
 
 
@@ -78,16 +67,12 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the list of audio files or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/recitation-autio-files}
      */
-    getAllAudioFilesofARecitation(recitation_id: number, query?: AudioQueryParams): Promise<ISingleRecitation | Error | AxiosError> {
-        if (!recitation_id) return Promise.reject(new Error('recitation_id is required'));
+    async getAllAudioFilesofARecitation(recitation_id: number, query?: AudioQueryParams): Promise<ISingleRecitation> {
+        if (!recitation_id) throw new AudioError('recitation_id is required');
         let uri = `/quran/recitations/${recitation_id}`;
         if (query && Object.values(query).length > 0)
             uri = `${uri}?${new URLSearchParams(query as URLSearchParams)}`;
-        return new Promise((resolve, reject) => {
-            api.get(uri)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+        return await apiWraper<ISingleRecitation>(uri);
     },
 
 
@@ -99,14 +84,10 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the list of chapter reciters or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/chapter-reciters}
      */
-    getListOfChapterReciters(language: string = 'en'): Promise<IReciters | Error | AxiosError> {
+    async getListOfChapterReciters(language: string = 'en'): Promise<IReciters> {
         const isLanguageSupported = ALLOWED_LANGUAGES.has(language);
-        if (!isLanguageSupported) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/chapter_reciters?${new URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+        if (!isLanguageSupported) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<IReciters>(`/resources/chapter_reciters?${new URLSearchParams({ language })}`);
     },
 
 
@@ -118,14 +99,10 @@ export const audio: AudioApi = {
     * @returns A promise that resolves to the audio recitations or rejects with an error.
     * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-surah-recitation}
     */
-    getAyahRecitationsForSpecificSurah(recitation_id: number, chapter_number: number): Promise<IAyahRecitationSpecificSurah | Error | AxiosError> {
+    async getAyahRecitationsForSpecificSurah(recitation_id: number, chapter_number: number): Promise<IAyahRecitationSpecificSurah> {
         if (!recitation_id || !chapter_number)
-            return Promise.reject(new Error('recitation_id and Chapter number is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/recitations/${recitation_id}/by_chapter/${chapter_number}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('recitation_id and Chapter number is required');
+        return await apiWraper(`/recitations/${recitation_id}/by_chapter/${chapter_number}`);
     },
 
 
@@ -137,14 +114,10 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the audio recitations or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-juz-recitaiton}
      */
-    getAyahRecitationsForSpecificJuz(recitation_id: number, juz_number: number): Promise<IAyahRecitationSpecificJuz | Error | AxiosError> {
+    async getAyahRecitationsForSpecificJuz(recitation_id: number, juz_number: number): Promise<IAyahRecitationSpecificJuz> {
         if (!recitation_id || !juz_number)
-            return Promise.reject(new Error('recitation_id and juz_number is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/recitations/${recitation_id}/by_juz/${juz_number}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('recitation_id and juz_number is required');
+        return await apiWraper<IAyahRecitationSpecificJuz>(`/recitations/${recitation_id}/by_juz/${juz_number}`)
     },
 
 
@@ -156,14 +129,10 @@ export const audio: AudioApi = {
     * @returns A promise that resolves to the audio recitations or rejects with an error.
     * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-page-recitaiton}
     */
-    getAyahRecitationForSpecificMadaniMushafPage(recitation_id: number, page_number: number): Promise<IAyahRecitationSpecificMadaniMushafPage | Error | AxiosError> {
+    async getAyahRecitationForSpecificMadaniMushafPage(recitation_id: number, page_number: number): Promise<IAyahRecitationSpecificMadaniMushafPage> {
         if (!recitation_id || !page_number)
-            return Promise.reject(new Error('recitation_id and Page number is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/recitations/${recitation_id}/by_page/${page_number}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('recitation_id and Page number is required');
+        return await apiWraper<IAyahRecitationSpecificMadaniMushafPage>(`/recitations/${recitation_id}/by_page/${page_number}`);
     },
 
 
@@ -175,14 +144,10 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the audio recitations or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-rub-el-hizb-recitaiton}
      */
-    getAyahRecitationForSpecificRubelHizb(recitation_id: number, rub_el_hizb_number: number): Promise<IAyahRecitationSpecificRubelHizb | Error | AxiosError> {
+    async getAyahRecitationForSpecificRubelHizb(recitation_id: number, rub_el_hizb_number: number): Promise<IAyahRecitationSpecificRubelHizb> {
         if (!recitation_id || !rub_el_hizb_number)
-            return Promise.reject(new Error('recitation_id and rub_el_hizb_number is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/recitations/${recitation_id}/by_rub/${rub_el_hizb_number}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('recitation_id and rub_el_hizb_number is required');
+        return await apiWraper<IAyahRecitationSpecificRubelHizb>(`/recitations/${recitation_id}/by_rub/${rub_el_hizb_number}`);
     },
 
 
@@ -194,14 +159,10 @@ export const audio: AudioApi = {
     * @returns A promise that resolves to the audio recitations or rejects with an error.
     * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-hizb-recitaiton}
     */
-    getAyahRecitationForSpecificHizb(recitation_id: number, hizb_number: number): Promise<IAyahRecitationSpecificHizb | Error | AxiosError> {
+    async getAyahRecitationForSpecificHizb(recitation_id: number, hizb_number: number): Promise<IAyahRecitationSpecificHizb> {
         if (!recitation_id || !hizb_number)
-            return Promise.reject(new Error('recitation_id and hizb_number is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/recitations/${recitation_id}/by_hizb/${hizb_number}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('recitation_id and hizb_number is required');
+        return await apiWraper<IAyahRecitationSpecificHizb>(`/recitations/${recitation_id}/by_hizb/${hizb_number}`);
     },
 
 
@@ -213,14 +174,10 @@ export const audio: AudioApi = {
      * @returns A promise that resolves to the audio recitations or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-ayah-recitaiton}
      */
-    getAyahRecitationForSpecificAyah(recitation_id: number, ayah_key: string): Promise<IAyahRecitationSpecificAyah | Error | AxiosError> {
+    async getAyahRecitationForSpecificAyah(recitation_id: number, ayah_key: string): Promise<IAyahRecitationSpecificAyah> {
         if (!recitation_id || !ayah_key)
-            return Promise.reject(new Error('recitation_id and ayah_key is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/recitations/${recitation_id}/by_ayah/${ayah_key}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+            throw new AudioError('recitation_id and ayah_key is required');
+        return await apiWraper<IAyahRecitationSpecificAyah>(`/recitations/${recitation_id}/by_ayah/${ayah_key}`);
     }
 
 };
diff --git a/src/apis/chapter.test.ts b/src/apis/chapter.test.ts
index bc6e545..b197318 100644
--- a/src/apis/chapter.test.ts
+++ b/src/apis/chapter.test.ts
@@ -1,4 +1,4 @@
-import { ListChapters } from "../types";
+import { ListChapters } from "../interfaces";
 import { chapter } from "./chapter";
 
 describe("Fetch all the chapter according to language", () => {
diff --git a/src/apis/chapter.ts b/src/apis/chapter.ts
index 4988b79..9539d5d 100644
--- a/src/apis/chapter.ts
+++ b/src/apis/chapter.ts
@@ -1,9 +1,6 @@
-import { AxiosError } from "axios";
-import Api from "../req";
-import { ChapterApi, ListChapters, Chapter, ChapterInfo, ALLOWED_LANGUAGES } from "../types";
-import { handleError, handleResponse } from "../utils";
-
-const api = Api();
+import { LanguageValidationError } from "../errors";
+import { ALLOWED_LANGUAGES, Chapter, ChapterApi, ChapterInfo, ListChapters } from "../interfaces";
+import { apiWraper } from "../utils";
 
 
 export const chapter: ChapterApi = {
@@ -15,14 +12,10 @@ export const chapter: ChapterApi = {
      * @returns A promise that resolves to the list of chapters or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/list-chapters}
      */
-    listChapters(language = 'en'): Promise<ListChapters | Error | AxiosError> {
+    async listChapters(language = 'en'): Promise<ListChapters> {
         const isLanguageSupported = language && ALLOWED_LANGUAGES.has(language);
-        if (!isLanguageSupported) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/chapters?${new URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+        if (!isLanguageSupported) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<ListChapters>(`/chapters?${new URLSearchParams({ language })}`);
     },
 
     /**
@@ -33,13 +26,9 @@ export const chapter: ChapterApi = {
      * @returns A promise that resolves to the chapter details or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/get-chapter}
      */
-    getChapter(id: number, language = 'en'): Promise<Chapter | Error | AxiosError> {
-        if (language && !ALLOWED_LANGUAGES.has(language)) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/chapters/${id}?${new URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getChapter(id: number, language = 'en'): Promise<Chapter> {
+        if (language && !ALLOWED_LANGUAGES.has(language)) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<Chapter>(`/chapters/${id}?${new URLSearchParams({ language })}`);
     },
 
     /**
@@ -50,13 +39,9 @@ export const chapter: ChapterApi = {
      * @returns A promise that resolves to the chapter information or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/info}
      */
-    getChapterInfo(chapter_id: number, language = 'en'): Promise<ChapterInfo | Error | AxiosError> {
-        if (language && !ALLOWED_LANGUAGES.has(language)) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/chapters/${chapter_id}/info?${new URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getChapterInfo(chapter_id: number, language = 'en'): Promise<ChapterInfo> {
+        if (language && !ALLOWED_LANGUAGES.has(language)) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<ChapterInfo>(`/chapters/${chapter_id}/info?${new URLSearchParams({ language })}`);
     }
 };
 
diff --git a/src/apis/juz.ts b/src/apis/juz.ts
index 2c65389..52f7ee8 100644
--- a/src/apis/juz.ts
+++ b/src/apis/juz.ts
@@ -1,9 +1,6 @@
-import { AxiosError } from "axios";
-import Api from "../req";
-import { JuzApi, JuzResponse } from "../types";
-import { handleError, handleResponse } from "../utils";
+import { JuzApi, JuzResponse } from "../interfaces";
+import { apiWraper, handleError, handleResponse } from "../utils";
 
-const api = Api();
 
 export const juz: JuzApi = {
 
@@ -14,11 +11,7 @@ export const juz: JuzApi = {
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/juzs}
      */
 
-    getAllJuzs(): Promise<JuzResponse | Error | AxiosError> {
-        return new Promise((resolve, reject) => {
-            api.get('/juzs')
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getAllJuzs(): Promise<JuzResponse> {
+        return await apiWraper<JuzResponse>('/juzs');
     },
 };
diff --git a/src/apis/quran.ts b/src/apis/quran.ts
index 0179f34..959264f 100644
--- a/src/apis/quran.ts
+++ b/src/apis/quran.ts
@@ -1,18 +1,17 @@
-import { AxiosError } from "axios";
-import Api from "../req";
 import {
-  QuranQuery, QuranResponse, UthmaniTajweedResponse,
-  UthmaniScriptResponse,
-  UthmaniSimpleScriptResponse, ImlaeiSimpleTextResponse,
-  TranslationQuery, SingleTranslationResponse,
-  SingleTafsirResponse,
   GlyphCodesOfAyahV1Response,
   GlyphCodesOfAyahV2Response,
-  QuranApi
-} from "../types";
-import { handleError, handleResponse } from "../utils";
-
-const api = Api();
+  ImlaeiSimpleTextResponse,
+  QuranApi,
+  QuranQuery, QuranResponse,
+  SingleTafsirResponse,
+  SingleTranslationResponse,
+  TranslationQuery,
+  UthmaniScriptResponse,
+  UthmaniSimpleScriptResponse,
+  UthmaniTajweedResponse
+} from "../interfaces";
+import { apiWraper } from "../utils";
 
 export const quran: QuranApi = {
 
@@ -23,13 +22,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the Indo-Pak script response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-indopak}
    */
-  getIndoPakScriptOfAyah(query?: QuranQuery): Promise<QuranResponse | AxiosError | Error> {
+  async getIndoPakScriptOfAyah(query?: QuranQuery): Promise<QuranResponse> {
     const uri = query ? `/quran/verses/code_v1?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/code_v1';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return apiWraper<QuranResponse>(uri);
   },
 
   /**
@@ -39,13 +34,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the Uthmani Tajweed script response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-uthmani-tajweed}
    */
-  getUthmaniTajweedScriptOfAyah(query?: QuranQuery): Promise<UthmaniTajweedResponse | AxiosError | Error> {
+  async getUthmaniTajweedScriptOfAyah(query?: QuranQuery): Promise<UthmaniTajweedResponse> {
     const uri = query ? `/quran/verses/uthmani_tajweed?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/uthmani_tajweed';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<UthmaniTajweedResponse>(uri);
   },
 
 
@@ -56,13 +47,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the Uthmani script response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-uthmani}
    */
-  getUthmaniScriptOfAyah(query?: QuranQuery): Promise<UthmaniScriptResponse | AxiosError | Error> {
+  async getUthmaniScriptOfAyah(query?: QuranQuery): Promise<UthmaniScriptResponse> {
     const uri = query ? `/quran/verses/uthmani?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/uthmani';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<UthmaniScriptResponse>(uri);
   },
 
   /**
@@ -72,13 +59,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the Uthmani simple script response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-uthmani-simple}
    */
-  getUthmaniSimpleScriptOfAyah(query?: QuranQuery): Promise<UthmaniSimpleScriptResponse | AxiosError | Error> {
+  async getUthmaniSimpleScriptOfAyah(query?: QuranQuery): Promise<UthmaniSimpleScriptResponse> {
     const uri = query ? `/quran/verses/uthmani_simple?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/uthmani_simple';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<UthmaniSimpleScriptResponse>(uri);
   },
 
   /**
@@ -88,13 +71,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the Imlaei simple text response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-imlaei}
    */
-  getImlaeiSimpleTextOfAyah(query?: QuranQuery): Promise<ImlaeiSimpleTextResponse | AxiosError | Error> {
+  async getImlaeiSimpleTextOfAyah(query?: QuranQuery): Promise<ImlaeiSimpleTextResponse> {
     const uri = query ? `/quran/verses/imlaei?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/imlaei';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<ImlaeiSimpleTextResponse>(uri);
   },
 
   /**
@@ -105,13 +84,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the single translation response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/translation}
    */
-  getASingleTranslation(translation_id: string, query?: TranslationQuery): Promise<SingleTranslationResponse | AxiosError | Error> {
+  async getASingleTranslation(translation_id: string, query?: TranslationQuery): Promise<SingleTranslationResponse> {
     const uri = query ? `/quran/translations/${translation_id}?${new URLSearchParams(query as URLSearchParams)}` : `/quran/translations/${translation_id}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<SingleTranslationResponse>(uri);
   },
 
   /**
@@ -122,13 +97,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the single tafsir response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/tafsir}
    */
-  getSingleTafsir(tafsir_id: string, query?: TranslationQuery): Promise<SingleTafsirResponse | AxiosError | Error> {
+  async getSingleTafsir(tafsir_id: string, query?: TranslationQuery): Promise<SingleTafsirResponse> {
     const uri = query ? `/quran/tafsirs/${tafsir_id}?${new URLSearchParams(query as URLSearchParams)}` : `/quran/tafsirs/${tafsir_id}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<SingleTafsirResponse>(uri);
   },
 
   /**
@@ -139,13 +110,9 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the single tafsir response or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-code-v-1}
    */
-  getGlyphCodesOfAyahV1(query?: QuranQuery): Promise<GlyphCodesOfAyahV1Response | AxiosError | Error> {
+  async getGlyphCodesOfAyahV1(query?: QuranQuery): Promise<GlyphCodesOfAyahV1Response> {
     const uri = query ? `/quran/verses/code_v1?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/code_v1';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<GlyphCodesOfAyahV1Response>(uri);
   },
 
   /**
@@ -155,12 +122,8 @@ export const quran: QuranApi = {
    * @returns A promise that resolves to the glyph codes response (version 2) or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/quran-verses-code-v-2}
    */
-  getGlyphCodesOfAyahV2(query?: QuranQuery): Promise<GlyphCodesOfAyahV2Response | AxiosError | Error> {
+  async getGlyphCodesOfAyahV2(query?: QuranQuery): Promise<GlyphCodesOfAyahV2Response> {
     const uri = query ? `/quran/verses/code_v2?${new URLSearchParams(query as URLSearchParams)}` : '/quran/verses/code_v2';
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<GlyphCodesOfAyahV2Response>(uri)
   },
 };
diff --git a/src/apis/resource.ts b/src/apis/resource.ts
index 3b1d55e..1ce8761 100644
--- a/src/apis/resource.ts
+++ b/src/apis/resource.ts
@@ -1,14 +1,17 @@
-import { AxiosError } from "axios";
-import Api from "../req";
+import { LanguageValidationError, ResourceError } from "../errors";
 import {
-    ResourceApi, RecitaionInfo,
-    TranslationInfo, TranslationResponse, TafsirsResponse,
-    TafsirInfoResponse, RecitationStyleResponse, LanguageResponse,
-    ChapterInfos, VerseMediaResponse, ALLOWED_LANGUAGES
-} from "../types";
-import { handleError, handleResponse } from "../utils";
-
-const api = Api();
+    ALLOWED_LANGUAGES,
+    ChapterInfos,
+    LanguageResponse,
+    RecitaionInfo,
+    RecitationStyleResponse,
+    ResourceApi,
+    TafsirInfoResponse,
+    TafsirsResponse,
+    TranslationInfo, TranslationResponse,
+    VerseMediaResponse
+} from "../interfaces";
+import { apiWraper } from "../utils";
 
 
 export const resources: ResourceApi = {
@@ -20,13 +23,9 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the recitation information or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/recitation-info}
      */
-    getRecitationInfo(recitation_id: string): Promise<RecitaionInfo | Error | AxiosError> {
-        if (!recitation_id) return Promise.reject(new Error('Recitation ID is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/recitations/${recitation_id}/info`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getRecitationInfo(recitation_id: string): Promise<RecitaionInfo> {
+        if (!recitation_id) throw new ResourceError('Recitation ID is required');
+        return await apiWraper<RecitaionInfo>(`/resources/recitations/${recitation_id}/info`);
     },
 
     /**
@@ -36,13 +35,9 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the translation information or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/translation-info}
      */
-    getTranslationInfo(translation_id: string): Promise<TranslationInfo | Error | AxiosError> {
-        if (!translation_id) return Promise.reject(new Error('Translation ID is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/translations/${translation_id}/info`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getTranslationInfo(translation_id: string): Promise<TranslationInfo> {
+        if (!translation_id) throw new ResourceError('Translation ID is required');
+        return await apiWraper<TranslationInfo>(`/resources/translations/${translation_id}/info`);
     },
 
     /**
@@ -52,14 +47,10 @@ export const resources: ResourceApi = {
     * @returns A promise that resolves to the translation response or rejects with an error.
     * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/translations}
     */
-    getTranslations(language: string = 'en'): Promise<TranslationResponse | Error | AxiosError> {
+    async getTranslations(language: string = 'en'): Promise<TranslationResponse> {
         const isLanguageSupported = ALLOWED_LANGUAGES.has(language);
-        if (!isLanguageSupported) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/translations?${new URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+        if (!isLanguageSupported) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<TranslationResponse>(`/resources/translations?${new URLSearchParams({ language })}`);
     },
 
     /**
@@ -69,14 +60,10 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the tafsirs response or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/tafsirs}
      */
-    getTafsirs(language: string = 'en'): Promise<TafsirsResponse | Error | AxiosError> {
+    async getTafsirs(language: string = 'en'): Promise<TafsirsResponse> {
         const isLanguageSupported = ALLOWED_LANGUAGES.has(language);
-        if (!isLanguageSupported) return Promise.reject(new Error("Provided language is not supported"));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/tafsirs?${new URLSearchParams({ language })}`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+        if (!isLanguageSupported) throw new LanguageValidationError("Provided language is not supported");
+        return await apiWraper<TafsirsResponse>(`/resources/tafsirs?${new URLSearchParams({ language })}`);
     },
 
     /**
@@ -86,13 +73,9 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the tafsir information or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/tafsir-info}
      */
-    getTafsirInfo(tafsir_id: string): Promise<TafsirInfoResponse | Error | AxiosError> {
-        if (!tafsir_id) return Promise.reject(new Error('Tafsir ID is required'));
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/tafsirs/${tafsir_id}/info`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getTafsirInfo(tafsir_id: string): Promise<TafsirInfoResponse> {
+        if (!tafsir_id) throw new ResourceError('Tafsir ID is required');
+        return await apiWraper<TafsirInfoResponse>(`/resources/tafsirs/${tafsir_id}/info`);
     },
 
     /**
@@ -101,12 +84,8 @@ export const resources: ResourceApi = {
     * @returns A promise that resolves to the recitation style response or rejects with an error.
     * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/recitation-styles}
     */
-    getRecitationStyles(): Promise<RecitationStyleResponse | Error | AxiosError> {
-        return new Promise((resolve, reject) => {
-            api.get('/resources/recitation_styles')
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getRecitationStyles(): Promise<RecitationStyleResponse> {
+        return await apiWraper<RecitationStyleResponse>('/resources/recitation_styles');
     },
 
 
@@ -116,12 +95,8 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the language response or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/languages}
      */
-    getLanguages(): Promise<LanguageResponse | Error | AxiosError> {
-        return new Promise((resolve, reject) => {
-            api.get('/resources/languages')
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getLanguages(): Promise<LanguageResponse> {
+        return await apiWraper<LanguageResponse>('/resources/languages');
     },
 
     /**
@@ -130,12 +105,8 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the chapter information or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/chapter-info}
      */
-    getChapterInfos(): Promise<ChapterInfos | Error | AxiosError> {
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/chapter_infos`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getChapterInfos(): Promise<ChapterInfos> {
+        return await apiWraper<ChapterInfos>(`/resources/chapter_infos`);
     },
 
     /**
@@ -144,11 +115,7 @@ export const resources: ResourceApi = {
      * @returns A promise that resolves to the verse media response or rejects with an error.
      * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verse-media}
      */
-    getVerseMedias(): Promise<VerseMediaResponse | Error | AxiosError> {
-        return new Promise((resolve, reject) => {
-            api.get(`/resources/verse_media`)
-                .then(handleResponse(resolve))
-                .catch(handleError(reject));
-        });
+    async getVerseMedias(): Promise<VerseMediaResponse> {
+        return apiWraper<VerseMediaResponse>(`/resources/verse_media`);
     }
 };
diff --git a/src/apis/verse.ts b/src/apis/verse.ts
index 1b60a07..19e5ec8 100644
--- a/src/apis/verse.ts
+++ b/src/apis/verse.ts
@@ -1,9 +1,7 @@
-import { AxiosError } from "axios";
-import Api from "../req";
-import { ALLOWED_LANGUAGES, VerseApi, VerseQuery, VerseResponse } from "../types";
-import { handleError, handleResponse } from "../utils";
+import { LanguageValidationError } from "../errors";
+import { ALLOWED_LANGUAGES, VerseApi, VerseQuery, VerseResponse } from "../interfaces";
+import { apiWraper, handleError, handleResponse } from "../utils";
 
-const api = Api();
 
 export const verse: VerseApi = {
 
@@ -15,14 +13,10 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing the verses or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verses-by-chapter-number}
    */
-  getVerseByChapter(chapter_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getVerseByChapter(chapter_number: string, query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/by_chapter/${chapter_number}?${new URLSearchParams(query as URLSearchParams)}` : `/verses/by_chapter/${chapter_number}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 
   /**
@@ -33,14 +27,10 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing the verses or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verses-by-page-number}
    */
-  getVerseByPage(page_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getVerseByPage(page_number: string, query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/by_page/${page_number}?${new URLSearchParams(query as URLSearchParams)}` : `/verses/by_page/${page_number}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 
   /**
@@ -51,14 +41,10 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing the verses or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verses-by-juz-number}
    */
-  getVerseByJuz(juz_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getVerseByJuz(juz_number: string, query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/by_juz/${juz_number}?${new URLSearchParams(query as URLSearchParams)}` : `/verses/by_juz/${juz_number}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 
   /**
@@ -69,14 +55,10 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing the verses or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verses-by-hizb-number}
    */
-  getVerseByHizbNumber(hizb_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getVerseByHizbNumber(hizb_number: string, query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/by_hizb/${hizb_number}?${new URLSearchParams(query as URLSearchParams)}` : `/verses/by_hizb/${hizb_number}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 
   /**
@@ -87,14 +69,10 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing the verses or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verses-by-rub-el-hizb-number}
    */
-  getVerseByRubElHizbNumber(rub_el_hizb_number: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getVerseByRubElHizbNumber(rub_el_hizb_number: string, query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/by_rub/${rub_el_hizb_number}?${new URLSearchParams(query as URLSearchParams)}` : `/verses/by_rub/${rub_el_hizb_number}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 
   /**
@@ -105,14 +83,10 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing the verse or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/verses-by-verse-key}
    */
-  getSpecificVerseByVerseKey(verse_key: string, query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getSpecificVerseByVerseKey(verse_key: string, query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/by_key/${verse_key}?${new URLSearchParams(query as URLSearchParams)}` : `/verses/by_key/${verse_key}`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 
   /**
@@ -122,13 +96,9 @@ export const verse: VerseApi = {
    * @returns A promise that resolves to the response containing a random verse or rejects with an error.
    * @see {@link https://api-docs.quran.com/docs/quran.com_versioned/random-verse}
    */
-  getRandomAyah(query?: VerseQuery): Promise<VerseResponse | AxiosError | Error> {
-    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new Error('Provided query language is not allowed');
+  async getRandomAyah(query?: VerseQuery): Promise<VerseResponse> {
+    if (query?.language && !ALLOWED_LANGUAGES.has(query.language)) throw new LanguageValidationError('Provided query language is not allowed');
     const uri = query ? `/verses/random?${new URLSearchParams(query as URLSearchParams)}` : `/verses/random`;
-    return new Promise((resolve, reject) => {
-      api.get(uri)
-        .then(handleResponse(resolve))
-        .catch(handleError(reject));
-    });
+    return await apiWraper<VerseResponse>(uri);
   },
 };
diff --git a/src/customError.ts b/src/customError.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/errors.ts b/src/errors.ts
new file mode 100644
index 0000000..efcfc20
--- /dev/null
+++ b/src/errors.ts
@@ -0,0 +1,29 @@
+export class LanguageValidationError extends Error {
+    constructor(message: string) {
+        super(message);
+    }
+};
+
+export class AudioError extends Error {
+    constructor(message: string) {
+        super(message);
+    }
+};
+
+export class ChapterError extends Error {
+    constructor(message: string) {
+        super(message);
+    }
+};
+
+export class ResourceError extends Error {
+    constructor(message: string) {
+        super(message);
+    }
+};
+
+export class VerseError extends Error {
+    constructor(message: string) {
+        super(message);
+    }
+};
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index 56f9b33..a41b05a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,2 +1,2 @@
 export * from './apis';
-export * from './types';
\ No newline at end of file
+export * from './interfaces';
\ No newline at end of file
diff --git a/src/types.ts b/src/interfaces.ts
similarity index 82%
rename from src/types.ts
rename to src/interfaces.ts
index 4055bc7..a1dc772 100644
--- a/src/types.ts
+++ b/src/interfaces.ts
@@ -116,17 +116,17 @@ export interface IAyahRecitationSpecificAyah {
 };
 
 export interface AudioApi {
-	getChaptersAudioOfAReciter(id: number, chapter_number: number): Promise<IAudio | Error | AxiosError>;
-	getAllChaptersAudioOfAReciter(id: number): Promise<IListOfAllAudioOfAReciter | Error | AxiosError>;
-	getRecitations(language: string): Promise<IRecitation | Error | AxiosError>;
-	getAllAudioFilesofARecitation(recitation_id: number, query?: AudioQueryParams): Promise<ISingleRecitation | Error | AxiosError>;
-	getListOfChapterReciters(language: string): Promise<IReciters | Error | AxiosError>;
-	getAyahRecitationsForSpecificSurah(recitation_id: number, chapter_number: number): Promise<IAyahRecitationSpecificSurah | Error | AxiosError>;
-	getAyahRecitationsForSpecificJuz(recitation_id: number, juz_number: number): Promise<IAyahRecitationSpecificJuz | Error | AxiosError>;
-	getAyahRecitationForSpecificMadaniMushafPage(recitation_id: number, page_number: number): Promise<IAyahRecitationSpecificMadaniMushafPage | Error | AxiosError>;
-	getAyahRecitationForSpecificRubelHizb(recitation_id: number, rub_el_hizb_number: number): Promise<IAyahRecitationSpecificRubelHizb | Error | AxiosError>;
-	getAyahRecitationForSpecificHizb(recitation_id: number, hizb_number: number): Promise<IAyahRecitationSpecificHizb | Error | AxiosError>;
-	getAyahRecitationForSpecificAyah(recitation_id: number, ayah_key: string): Promise<IAyahRecitationSpecificAyah | Error | AxiosError>;
+	getChaptersAudioOfAReciter(id: number, chapter_number: number): Promise<IAudio>;
+	getAllChaptersAudioOfAReciter(id: number): Promise<IListOfAllAudioOfAReciter>;
+	getRecitations(language: string): Promise<IRecitation>;
+	getAllAudioFilesofARecitation(recitation_id: number, query?: AudioQueryParams): Promise<ISingleRecitation>;
+	getListOfChapterReciters(language: string): Promise<IReciters>;
+	getAyahRecitationsForSpecificSurah(recitation_id: number, chapter_number: number): Promise<IAyahRecitationSpecificSurah>;
+	getAyahRecitationsForSpecificJuz(recitation_id: number, juz_number: number): Promise<IAyahRecitationSpecificJuz>;
+	getAyahRecitationForSpecificMadaniMushafPage(recitation_id: number, page_number: number): Promise<IAyahRecitationSpecificMadaniMushafPage>;
+	getAyahRecitationForSpecificRubelHizb(recitation_id: number, rub_el_hizb_number: number): Promise<IAyahRecitationSpecificRubelHizb>;
+	getAyahRecitationForSpecificHizb(recitation_id: number, hizb_number: number): Promise<IAyahRecitationSpecificHizb>;
+	getAyahRecitationForSpecificAyah(recitation_id: number, ayah_key: string): Promise<IAyahRecitationSpecificAyah>;
 };
 
 export interface ChapterTranslate {
@@ -166,9 +166,9 @@ export interface ChapterInfoResponse {
 };
 
 export interface ChapterApi {
-	listChapters: (language?: string) => Promise<ListChapters | Error | AxiosError>;
-	getChapter: (id: number, language?: string) => Promise<Chapter | Error | AxiosError>;
-	getChapterInfo: (chapter_id: number, language?: string) => Promise<ChapterInfo | Error | AxiosError>;
+	listChapters: (language?: string) => Promise<ListChapters>;
+	getChapter: (id: number, language?: string) => Promise<Chapter>;
+	getChapterInfo: (chapter_id: number, language?: string) => Promise<ChapterInfo>;
 };
 
 
@@ -178,7 +178,7 @@ export interface JuzResponse {
 
 
 export interface JuzApi {
-	getAllJuzs: () => Promise<JuzResponse | Error | AxiosError>;
+	getAllJuzs: () => Promise<JuzResponse>;
 };
 
 export interface RecitaionInfo {
@@ -268,15 +268,15 @@ export interface VerseMediaResponse {
 };
 
 export interface ResourceApi {
-	getRecitationInfo: (recitation_id: string) => Promise<RecitaionInfo | Error | AxiosError>;
-	getTranslationInfo: (translation_id: string) => Promise<TranslationInfo | Error | AxiosError>;
-	getTranslations: (language?: string) => Promise<TranslationResponse | Error | AxiosError>;
-	getTafsirs: (language?: string) => Promise<TafsirsResponse | Error | AxiosError>;
-	getTafsirInfo: (tafsir_id: string) => Promise<TafsirInfoResponse | Error | AxiosError>;
-	getRecitationStyles: () => Promise<RecitationStyleResponse | Error | AxiosError>;
-	getLanguages: () => Promise<LanguageResponse | Error | AxiosError>;
-	getChapterInfos: () => Promise<ChapterInfos | Error | AxiosError>;
-	getVerseMedias: () => Promise<VerseMediaResponse | Error | AxiosError>;
+	getRecitationInfo: (recitation_id: string) => Promise<RecitaionInfo>;
+	getTranslationInfo: (translation_id: string) => Promise<TranslationInfo>;
+	getTranslations: (language?: string) => Promise<TranslationResponse>;
+	getTafsirs: (language?: string) => Promise<TafsirsResponse>;
+	getTafsirInfo: (tafsir_id: string) => Promise<TafsirInfoResponse>;
+	getRecitationStyles: () => Promise<RecitationStyleResponse>;
+	getLanguages: () => Promise<LanguageResponse>;
+	getChapterInfos: () => Promise<ChapterInfos>;
+	getVerseMedias: () => Promise<VerseMediaResponse>;
 };
 
 export interface VerseResponse {
@@ -356,13 +356,13 @@ export interface VerseQuery {
 
 
 export interface VerseApi {
-	getVerseByChapter: (chapter_number: string, query?: VerseQuery) => Promise<VerseResponse | AxiosError | Error>;
-	getVerseByPage: (page_number: string, query?: VerseQuery) => Promise<VerseResponse | Error | AxiosError>;
-	getVerseByJuz: (juz_number: string, query?: VerseQuery) => Promise<VerseResponse | Error | AxiosError>;
-	getVerseByHizbNumber: (hizb_number: string, query?: VerseQuery) => Promise<VerseResponse | Error | AxiosError>;
-	getVerseByRubElHizbNumber: (rub_el_hizb_number: string, query?: VerseQuery) => Promise<VerseResponse | Error | AxiosError>;
-	getSpecificVerseByVerseKey: (verse_key: string, query?: VerseQuery) => Promise<VerseResponse | Error | AxiosError>;
-	getRandomAyah: (query?: VerseQuery) => Promise<VerseResponse | Error | AxiosError>;
+	getVerseByChapter: (chapter_number: string, query?: VerseQuery) => Promise<VerseResponse>;
+	getVerseByPage: (page_number: string, query?: VerseQuery) => Promise<VerseResponse>;
+	getVerseByJuz: (juz_number: string, query?: VerseQuery) => Promise<VerseResponse>;
+	getVerseByHizbNumber: (hizb_number: string, query?: VerseQuery) => Promise<VerseResponse>;
+	getVerseByRubElHizbNumber: (rub_el_hizb_number: string, query?: VerseQuery) => Promise<VerseResponse>;
+	getSpecificVerseByVerseKey: (verse_key: string, query?: VerseQuery) => Promise<VerseResponse>;
+	getRandomAyah: (query?: VerseQuery) => Promise<VerseResponse>;
 };
 
 export interface QuranQuery {
@@ -489,13 +489,13 @@ export interface GlyphCodesOfAyahV2 {
 
 
 export interface QuranApi {
-	getIndoPakScriptOfAyah: (query?: QuranQuery) => Promise<QuranResponse | AxiosError | Error>;
-	getUthmaniTajweedScriptOfAyah: (query?: QuranQuery) => Promise<UthmaniTajweedResponse | AxiosError | Error>;
-	getUthmaniScriptOfAyah: (query?: QuranQuery) => Promise<UthmaniScriptResponse | AxiosError | Error>;
-	getUthmaniSimpleScriptOfAyah: (query?: QuranQuery) => Promise<UthmaniSimpleScriptResponse | AxiosError | Error>;
-	getImlaeiSimpleTextOfAyah: (query?: QuranQuery) => Promise<ImlaeiSimpleTextResponse | AxiosError | Error>;
-	getASingleTranslation: (translation_id: string, query?: TranslationQuery) => Promise<SingleTranslationResponse | AxiosError | Error>;
-	getSingleTafsir: (tafsir_id: string, query?: TranslationQuery) => Promise<SingleTafsirResponse | AxiosError | Error>;
-	getGlyphCodesOfAyahV1: (query?: QuranQuery) => Promise<GlyphCodesOfAyahV1Response | AxiosError | Error>;
-	getGlyphCodesOfAyahV2: (query?: QuranQuery) => Promise<GlyphCodesOfAyahV2Response | AxiosError | Error>;
+	getIndoPakScriptOfAyah: (query?: QuranQuery) => Promise<QuranResponse>;
+	getUthmaniTajweedScriptOfAyah: (query?: QuranQuery) => Promise<UthmaniTajweedResponse>;
+	getUthmaniScriptOfAyah: (query?: QuranQuery) => Promise<UthmaniScriptResponse>;
+	getUthmaniSimpleScriptOfAyah: (query?: QuranQuery) => Promise<UthmaniSimpleScriptResponse>;
+	getImlaeiSimpleTextOfAyah: (query?: QuranQuery) => Promise<ImlaeiSimpleTextResponse>;
+	getASingleTranslation: (translation_id: string, query?: TranslationQuery) => Promise<SingleTranslationResponse>;
+	getSingleTafsir: (tafsir_id: string, query?: TranslationQuery) => Promise<SingleTafsirResponse>;
+	getGlyphCodesOfAyahV1: (query?: QuranQuery) => Promise<GlyphCodesOfAyahV1Response>;
+	getGlyphCodesOfAyahV2: (query?: QuranQuery) => Promise<GlyphCodesOfAyahV2Response>;
 };
\ No newline at end of file
diff --git a/src/req.ts b/src/req.ts
index 9b13c0a..ae17d0c 100644
--- a/src/req.ts
+++ b/src/req.ts
@@ -1,7 +1,7 @@
 import Agent from "agentkeepalive";
 import axios, { AxiosInstance } from "axios";
 import config from "./config";
-import { CustomHeaders } from "./types";
+import { CustomHeaders } from "./interfaces";
 
 
 
@@ -49,7 +49,7 @@ const Api = (
     });
 
     axiosInstance.interceptors.response.use(
-        (response) => response,
+        (response) => response.data,
         (error) => Promise.reject(error.toJSON()),
     );
 
diff --git a/src/utils.ts b/src/utils.ts
index a1a9705..2fcf865 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,4 +1,7 @@
 import { AxiosError, AxiosResponse } from 'axios';
+import Api from './req';
+
+const api = Api();
 
 /**
  * Handles the response from an Axios request.
@@ -20,4 +23,9 @@ export const handleResponse = <T>(
  */
 export const handleError = (reject: (reason: Error | AxiosError) => void) =>
     (error: AxiosError) =>
-        reject(error);
\ No newline at end of file
+        reject(error);
+
+
+export const apiWraper = async <T>(query: string): Promise<T> => {
+    return await api.get(query);
+};
\ No newline at end of file