diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp
index ee8b6e5bd45..3690b7243e5 100644
--- a/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/accessible/src/atk/nsAccessibleWrap.cpp
@@ -713,8 +713,7 @@ getNameCB(AtkObject *aAtkObj)
 
     nsAutoString uniName;
 
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     /* nsIAccessible is responsible for the non-NULL name */
     nsresult rv = accWrap->GetName(uniName);
@@ -741,8 +740,7 @@ getDescriptionCB(AtkObject *aAtkObj)
         gint len;
         nsAutoString uniDesc;
 
-        nsAccessibleWrap *accWrap =
-            NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+        nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
         /* nsIAccessible is responsible for the non-NULL description */
         nsresult rv = accWrap->GetDescription(uniDesc);
@@ -764,14 +762,12 @@ getRoleCB(AtkObject *aAtkObj)
     }
 
 #ifdef DEBUG_A11Y
-        nsAccessibleWrap *testAccWrap =
-            NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+        nsAccessibleWrap *testAccWrap = GetAccessibleWrap(aAtkObj);
         NS_ASSERTION(nsAccessible::IsTextInterfaceSupportCorrect(testAccWrap), "Does not support nsIAccessibleText when it should");
 #endif
 
     if (aAtkObj->role == ATK_ROLE_INVALID) {
-        nsAccessibleWrap *accWrap =
-            NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+        nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
         PRUint32 accRole, atkRole;
         nsresult rv = accWrap->GetFinalRole(&accRole);
@@ -828,8 +824,7 @@ getAttributesCB(AtkObject *aAtkObj)
     if (NS_FAILED(CheckMaiAtkObject(aAtkObj))) {
       return nsnull;
     }
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     return GetAttributeSet(accWrap);
 }
@@ -840,22 +835,20 @@ getParentCB(AtkObject *aAtkObj)
     if (NS_FAILED(CheckMaiAtkObject(aAtkObj))) {
       return nsnull;
     }
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     nsCOMPtr<nsIAccessible> accParent;
     nsresult rv = accWrap->GetParent(getter_AddRefs(accParent));
     if (NS_FAILED(rv) || !accParent)
         return nsnull;
-    nsIAccessible *tmpParent = accParent;
-    nsAccessibleWrap *accWrapParent = NS_STATIC_CAST(nsAccessibleWrap *,
-                                                     tmpParent);
 
-    AtkObject *parentAtkObj = accWrapParent->GetAtkObject();
+    void *parentAtkObj = nsnull;
+    accParent->GetNativeInterface(&parentAtkObj);
+
     if (parentAtkObj && !aAtkObj->accessible_parent) {
-        atk_object_set_parent(aAtkObj, parentAtkObj);
+        atk_object_set_parent(aAtkObj, ATK_OBJECT(parentAtkObj));
     }
-    return parentAtkObj;
+    return aAtkObj->accessible_parent;
 }
 
 gint
@@ -864,8 +857,7 @@ getChildCountCB(AtkObject *aAtkObj)
     if (NS_FAILED(CheckMaiAtkObject(aAtkObj))) {
       return 0;
     }
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     PRInt32 count = 0;
     nsCOMPtr<nsIAccessibleHyperText> hyperText;
@@ -899,8 +891,7 @@ refChildCB(AtkObject *aAtkObj, gint aChildIndex)
     if (NS_FAILED(CheckMaiAtkObject(aAtkObj))) {
       return nsnull;
     }
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     nsresult rv;
     nsCOMPtr<nsIAccessible> accChild;
@@ -923,17 +914,16 @@ refChildCB(AtkObject *aAtkObj, gint aChildIndex)
     if (NS_FAILED(rv) || !accChild)
         return nsnull;
 
-    nsIAccessible *tmpAccChild = accChild;
-    nsAccessibleWrap *accWrapChild =
-        NS_STATIC_CAST(nsAccessibleWrap*, tmpAccChild);
+    void* childAtkObjPtr = nsnull;
+    accChild->GetNativeInterface(&childAtkObjPtr);
 
-    //this will addref parent
-    AtkObject *childAtkObj = accWrapChild->GetAtkObject();
-    NS_ASSERTION(childAtkObj, "Fail to get AtkObj");
-    if (!childAtkObj)
+    NS_ASSERTION(childAtkObjPtr, "Fail to get AtkObj");
+    if (!childAtkObjPtr)
         return nsnull;
-    atk_object_set_parent(childAtkObj,
-                          accWrap->GetAtkObject());
+    
+    AtkObject* childAtkObj = ATK_OBJECT(childAtkObjPtr);
+    //this will addref parent
+    atk_object_set_parent(childAtkObj, aAtkObj);
     g_object_ref(childAtkObj);
     return childAtkObj;
 }
@@ -946,8 +936,7 @@ getIndexInParentCB(AtkObject *aAtkObj)
     if (NS_FAILED(CheckMaiAtkObject(aAtkObj))) {
       return -1;
     }
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     nsCOMPtr<nsIAccessible> parent;
     accWrap->GetParent(getter_AddRefs(parent));
@@ -1017,8 +1006,7 @@ refStateSetCB(AtkObject *aAtkObj)
         return state_set;
     }
 
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     // Map states
     PRUint32 accState = 0, accExtState = 0;
@@ -1040,8 +1028,7 @@ refRelationSetCB(AtkObject *aAtkObj)
     if (NS_FAILED(CheckMaiAtkObject(aAtkObj))) {
       return relation_set;
     }
-    nsAccessibleWrap *accWrap =
-        NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap;
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
 
     AtkObject *accessible_array[1];
     AtkRelation* relation;
@@ -1067,7 +1054,9 @@ refRelationSetCB(AtkObject *aAtkObj)
         nsIAccessible* accRelated;
         nsresult rv = accWrap->GetAccessibleRelated(relationType[i], &accRelated);
         if (NS_SUCCEEDED(rv) && accRelated) {
-            accessible_array[0] = NS_STATIC_CAST(nsAccessibleWrap*, accRelated)->GetAtkObject();
+            void *relatedAtkObj = nsnull;
+            accRelated->GetNativeInterface(&relatedAtkObj);
+            accessible_array[0] = ATK_OBJECT(relatedAtkObj);
             relation = atk_relation_new(accessible_array, 1,
                                         NS_STATIC_CAST(AtkRelationType, relationType[i]));
             atk_relation_set_add(relation_set, relation);
@@ -1083,7 +1072,7 @@ nsresult
 CheckMaiAtkObject(AtkObject *aAtkObj)
 {
     NS_ENSURE_ARG(IS_MAI_OBJECT(aAtkObj));
-    nsAccessibleWrap * tmpAccWrap = MAI_ATK_OBJECT(aAtkObj)->accWrap;
+    nsAccessibleWrap * tmpAccWrap = GetAccessibleWrap(aAtkObj);
 
     // Check if AccessibleWrap was deconstructed
     if (tmpAccWrap == nsnull) {
@@ -1121,11 +1110,12 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
 
     nsCOMPtr<nsIAccessible> accessible;
     aEvent->GetAccessible(getter_AddRefs(accessible));
-    nsIAccessible *tmpAccessible = accessible;
-    nsAccessibleWrap *accWrap = NS_STATIC_CAST(nsAccessibleWrap*, tmpAccessible);
-    NS_ENSURE_TRUE(accWrap, NS_ERROR_FAILURE);
+    NS_ENSURE_TRUE(accessible, NS_ERROR_FAILURE);
 
-    AtkObject *atkObj = accWrap->GetAtkObject();
+    void *atkObjPtr = nsnull;
+    accessible->GetNativeInterface(&atkObjPtr);
+
+    AtkObject *atkObj = ATK_OBJECT(atkObjPtr);
     NS_ENSURE_TRUE(atkObj, NS_ERROR_FAILURE);
 
     PRUint32 type = 0;
diff --git a/accessible/src/atk/nsDocAccessibleWrap.cpp b/accessible/src/atk/nsDocAccessibleWrap.cpp
index 460d5860bbe..5d6d57ad4a3 100644
--- a/accessible/src/atk/nsDocAccessibleWrap.cpp
+++ b/accessible/src/atk/nsDocAccessibleWrap.cpp
@@ -76,16 +76,17 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent,
 
     nsresult rv = NS_ERROR_FAILURE;
 
-    nsAccessibleWrap *accWrap =
-        NS_STATIC_CAST(nsAccessibleWrap *, aAccessible);
     MAI_LOG_DEBUG(("\n\nReceived event: aEvent=%u, obj=0x%x, data=0x%x \n",
                    aEvent, aAccessible, aEventData));
+    void *atkObjPtr = nsnull;
+    aAccessible->GetNativeInterface(&atkObjPtr);
     // We don't create ATK objects for nsIAccessible plain text leaves,
     // just return NS_OK in such case
-    AtkObject *atkObj = accWrap->GetAtkObject();
-    if (!atkObj) {
+    if (!atkObjPtr) {
       return NS_OK;
     }
+    AtkObject *atkObj = ATK_OBJECT(atkObjPtr);
+    nsAccessibleWrap *accWrap = GetAccessibleWrap(atkObj);
 
     AtkTableChange * pAtkTableChange = nsnull;
 
diff --git a/accessible/src/atk/nsMaiHyperlink.cpp b/accessible/src/atk/nsMaiHyperlink.cpp
index ee410a47251..ad88e010093 100644
--- a/accessible/src/atk/nsMaiHyperlink.cpp
+++ b/accessible/src/atk/nsMaiHyperlink.cpp
@@ -243,16 +243,16 @@ getObjectCB(AtkHyperlink *aLink, gint aLinkIndex)
     NS_ENSURE_TRUE(accHyperlink, nsnull);
 
     nsCOMPtr<nsIAccessible> accObj;
-    nsresult rv = accHyperlink->GetObject(aLinkIndex, getter_AddRefs(accObj));
-    NS_ENSURE_SUCCESS(rv, nsnull);
-    AtkObject *atkObj = nsnull;
-    if (accObj) {
-        nsIAccessible *tmpObj = accObj;
-        nsAccessibleWrap *accWrap = NS_STATIC_CAST(nsAccessibleWrap *, tmpObj);
-        atkObj = accWrap->GetAtkObject();
+    accHyperlink->GetObject(aLinkIndex, getter_AddRefs(accObj));
+    NS_ENSURE_TRUE(accObj, nsnull);
+
+    void *atkObj = nsnull;
+    accObj->GetNativeInterface(&atkObj);
+    if (!atkObj) {
+        return nsnull;
     }
-    //no need to add ref it, because it is "get" not "ref" ???
-    return atkObj;
+    //no need to add ref it, because it is "get" not "ref"
+    return ATK_OBJECT(atkObj);
 }
 
 gint
diff --git a/accessible/src/atk/nsMaiInterfaceComponent.cpp b/accessible/src/atk/nsMaiInterfaceComponent.cpp
index 894349e09e2..daf672b479a 100644
--- a/accessible/src/atk/nsMaiInterfaceComponent.cpp
+++ b/accessible/src/atk/nsMaiInterfaceComponent.cpp
@@ -77,16 +77,17 @@ refAccessibleAtPointCB(AtkComponent *aComponent,
     }
 
     nsCOMPtr<nsIAccessible> pointAcc;
-    nsresult rv = accWrap->GetChildAtPoint(aAccX, aAccY, getter_AddRefs(pointAcc));
-    if (NS_FAILED(rv))
+    accWrap->GetChildAtPoint(aAccX, aAccY, getter_AddRefs(pointAcc));
+    if (!pointAcc) {
         return nsnull;
+    }
 
-    nsIAccessible *tmpAcc = pointAcc;
-    nsAccessibleWrap *tmpAccWrap =
-        NS_STATIC_CAST(nsAccessibleWrap *, tmpAcc);
-    AtkObject *atkObj = tmpAccWrap->GetAtkObject();
-    if (!atkObj)
+    void *atkObjPtr = nsnull;
+    pointAcc->GetNativeInterface(&atkObjPtr);
+    if (!atkObjPtr) {
         return nsnull;
+    }
+    AtkObject *atkObj = ATK_OBJECT(atkObjPtr);
     g_object_ref(atkObj);
     return atkObj;
 }
diff --git a/accessible/src/atk/nsMaiInterfaceSelection.cpp b/accessible/src/atk/nsMaiInterfaceSelection.cpp
index 02815f839c1..08a2f0d7373 100644
--- a/accessible/src/atk/nsMaiInterfaceSelection.cpp
+++ b/accessible/src/atk/nsMaiInterfaceSelection.cpp
@@ -95,17 +95,18 @@ refSelectionCB(AtkSelection *aSelection, gint i)
                             getter_AddRefs(accSelection));
     NS_ENSURE_TRUE(accSelection, nsnull);
 
-    AtkObject *atkObj = nsnull;
     nsCOMPtr<nsIAccessible> accSelect;
-    nsresult rv = accSelection->RefSelection(i, getter_AddRefs(accSelect));
-    if (NS_SUCCEEDED(rv) && accSelect) {
-        nsIAccessible *tmpAcc = accSelect;
-        nsAccessibleWrap *refAccWrap =
-            NS_STATIC_CAST(nsAccessibleWrap *, tmpAcc);
-        atkObj = refAccWrap->GetAtkObject();
-        if (atkObj)
-            g_object_ref(atkObj);
+    accSelection->RefSelection(i, getter_AddRefs(accSelect));
+    if (!accSelect) {
+        return nsnull;
     }
+    void *atkObjPtr = nsnull;
+    accSelect->GetNativeInterface(&atkObjPtr);
+    if (!atkObjPtr) {
+        return nsnull;
+    }
+    AtkObject *atkObj = ATK_OBJECT(atkObjPtr);
+    g_object_ref(atkObj);
     return atkObj;
 }
 
diff --git a/accessible/src/atk/nsMaiInterfaceTable.cpp b/accessible/src/atk/nsMaiInterfaceTable.cpp
index 7768cca8b65..b4f9a3ef6db 100644
--- a/accessible/src/atk/nsMaiInterfaceTable.cpp
+++ b/accessible/src/atk/nsMaiInterfaceTable.cpp
@@ -84,13 +84,14 @@ refAtCB(AtkTable *aTable, gint aRow, gint aColumn)
     if (NS_FAILED(rv) || !cell)
         return nsnull;
 
-    nsIAccessible *tmpAcc = cell;
-    nsAccessibleWrap *cellAccWrap = NS_STATIC_CAST(nsAccessibleWrap *, tmpAcc);
+    void *cellAtkObjPtr = nsnull;
+    cell->GetNativeInterface(&cellAtkObjPtr);
+    if (!cellAtkObjPtr)
+        return nsnull;
 
-    AtkObject *atkObj = cellAccWrap->GetAtkObject();
-    if (atkObj)
-        g_object_ref(atkObj);
-    return atkObj;
+    AtkObject *cellAtkObj = ATK_OBJECT(cellAtkObjPtr);
+    g_object_ref(cellAtkObj);
+    return cellAtkObj;
 }
 
 gint
@@ -237,11 +238,9 @@ getCaptionCB(AtkTable *aTable)
     if (NS_FAILED(rv) || !caption)
         return nsnull;
 
-    nsIAccessible *tmpAcc = caption;
-    nsAccessibleWrap *captionAccWrap =
-        NS_STATIC_CAST(nsAccessibleWrap *, tmpAcc);
-
-    return captionAccWrap->GetAtkObject();
+    void *captionAtkObj = nsnull;
+    caption->GetNativeInterface(&captionAtkObj);
+    return ATK_OBJECT(captionAtkObj);
 }
 
 const gchar*
@@ -291,11 +290,9 @@ getColumnHeaderCB(AtkTable *aTable, gint aColumn)
     header->CellRefAt(0, aColumn, getter_AddRefs(accHeader));
     NS_ENSURE_TRUE(accHeader, nsnull);
 
-    nsIAccessible *tmpAcc = accHeader;
-    nsAccessibleWrap *headerAccWrap =
-        NS_STATIC_CAST(nsAccessibleWrap *, tmpAcc);
-
-    return headerAccWrap->GetAtkObject();
+    void *headerAtkObj = nsnull;
+    accHeader->GetNativeInterface(&headerAtkObj);
+    return ATK_OBJECT(headerAtkObj);
 }
 
 const gchar*
@@ -332,13 +329,11 @@ getRowHeaderCB(AtkTable *aTable, gint aRow)
     NS_ENSURE_SUCCESS(rv, nsnull);
 
     nsCOMPtr<nsIAccessible> accHeader(do_QueryInterface(header));
-    NS_ENSURE_TRUE(accTable, nsnull);
+    NS_ENSURE_TRUE(accHeader, nsnull);
 
-    nsIAccessible *tmpAcc = accHeader;
-    nsAccessibleWrap *headerAccWrap =
-        NS_STATIC_CAST(nsAccessibleWrap *, tmpAcc);
-
-    return headerAccWrap->GetAtkObject();
+    void *headerAtkObj = nsnull;
+    accHeader->GetNativeInterface(&headerAtkObj);
+    return ATK_OBJECT(headerAtkObj);
 }
 
 AtkObject*