diff --git a/testmaps/js/resources.js b/testmaps/js/resources.js
index dd04565..47ce58c 100644
--- a/testmaps/js/resources.js
+++ b/testmaps/js/resources.js
@@ -21,7 +21,7 @@ define(function () {
             'maps/iso/Isometric_cubes.tmx',
             'maps/iso/Isometric_cubes_large.tmx',
             'maps/iso/Isometric_cubes_with_objects.tmx',
-            'maps/iso/Isometric_cubes_large_with_objects.tmx',
+            'maps/iso/Isometric_cubes_with_objects_large.tmx',
             'maps/iso/Isometric_land.tmx'
         ]
     };
diff --git a/testmaps/maps/iso/Isometric_cubes_with_objects.tmx b/testmaps/maps/iso/Isometric_cubes_with_objects.tmx
index 8f9b6c3..aa1053e 100644
--- a/testmaps/maps/iso/Isometric_cubes_with_objects.tmx
+++ b/testmaps/maps/iso/Isometric_cubes_with_objects.tmx
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="isometric" renderorder="right-down" width="5" height="5" tilewidth="64" tileheight="32">
+<map version="1.0" orientation="isometric" renderorder="right-down" width="5" height="5" tilewidth="64" tileheight="32" nextobjectid="25">
  <properties>
   <property name="interactive" value="true"/>
  </properties>
- <tileset firstgid="1" name="greyBlack" tilewidth="64" tileheight="64" spacing="1" margin="1">
+ <tileset firstgid="1" name="greyBlack" tilewidth="64" tileheight="64" spacing="1" margin="1" tilecount="2" columns="2">
   <tileoffset x="0" y="32"/>
   <properties>
-   <property name="hitArea" value="32,-32,0,-48,32,-64,64,-48"/>
+   <property name="hitArea" value="[32,-32,0,-48,32,-64,64,-48]"/>
   </properties>
   <image source="../gfx/png/greyBlack.png" trans="ff00ff" width="131" height="66"/>
  </tileset>
- <tileset firstgid="3" name="greenBlue_x0_y32" tilewidth="64" tileheight="64" spacing="1" margin="1">
+ <tileset firstgid="3" name="greenBlue_x0_y32" tilewidth="64" tileheight="64" spacing="1" margin="1" tilecount="2" columns="2">
   <tileoffset x="0" y="32"/>
   <image source="../gfx/png/greenBlue_x0_y32.png" trans="ff00ff" width="131" height="66"/>
  </tileset>
- <tileset firstgid="5" name="miniGreen" tilewidth="64" tileheight="64" spacing="1" margin="1">
+ <tileset firstgid="5" name="miniGreen" tilewidth="64" tileheight="64" spacing="1" margin="1" tilecount="2" columns="2">
   <tileoffset x="0" y="32"/>
   <image source="../gfx/png/miniGreen.png" trans="ff00ff" width="131" height="66"/>
  </tileset>
- <tileset firstgid="7" name="singleTallBall" tilewidth="64" tileheight="72" spacing="1" margin="1">
+ <tileset firstgid="7" name="singleTallBall" tilewidth="64" tileheight="72" spacing="1" margin="1" tilecount="1" columns="1">
   <tileoffset x="0" y="40"/>
   <image source="../gfx/png/singleTallBall.png" trans="ff00ff" width="66" height="74"/>
  </tileset>
- <tileset firstgid="8" name="blue_x10" tilewidth="75" tileheight="64" spacing="1" margin="1">
+ <tileset firstgid="8" name="blue_x10" tilewidth="75" tileheight="64" spacing="1" margin="1" tilecount="1" columns="1">
   <tileoffset x="-10" y="32"/>
   <image source="../gfx/png/blue_x10.png" trans="ff00ff" width="76" height="66"/>
  </tileset>
@@ -32,65 +32,65 @@
   </data>
  </layer>
  <objectgroup name="object_indiv" visible="0">
-  <object x="32" y="32" width="32" height="32"/>
-  <object x="116" y="47" width="36" height="57"/>
-  <object x="32" y="96" width="64" height="32"/>
-  <object x="71" y="6" width="25" height="26"/>
-  <object x="0" y="0" width="32" height="64"/>
-  <object x="66" y="61" width="72" height="25"/>
+  <object id="1" x="32" y="32" width="32" height="32"/>
+  <object id="2" x="116" y="47" width="36" height="57"/>
+  <object id="3" x="32" y="96" width="64" height="32"/>
+  <object id="4" x="71" y="6" width="25" height="26"/>
+  <object id="5" x="0" y="0" width="32" height="64"/>
+  <object id="6" x="66" y="61" width="72" height="25"/>
  </objectgroup>
  <objectgroup name="object_large" visible="0">
-  <object x="0" y="128" width="128" height="32"/>
-  <object x="0" y="32" width="96" height="64"/>
+  <object id="7" x="0" y="128" width="128" height="32"/>
+  <object id="8" x="0" y="32" width="96" height="64"/>
  </objectgroup>
  <objectgroup name="polygon" visible="0">
-  <object x="0" y="64">
+  <object id="9" x="0" y="64">
    <polygon points="0,0 32,0 0,32"/>
   </object>
-  <object x="64" y="96">
+  <object id="10" x="64" y="96">
    <polygon points="0,0 0,-32 32,-32"/>
   </object>
-  <object x="64" y="0">
+  <object id="11" x="64" y="0">
    <polygon points="0,0 0,32 96,0"/>
   </object>
-  <object x="32" y="128">
+  <object id="12" x="32" y="128">
    <polygon points="0,0 0,32 -32,32"/>
   </object>
  </objectgroup>
  <objectgroup name="polylines" visible="0">
-  <object x="96" y="0">
+  <object id="13" x="96" y="0">
    <polyline points="0,0 64,0 64,32 32,0 32,32 0,32 0,0"/>
   </object>
-  <object x="0" y="0">
+  <object id="14" x="0" y="0">
    <polyline points="0,0 64,0 64,32 32,0 32,32 0,0"/>
   </object>
  </objectgroup>
  <objectgroup name="PolylineCrazy" visible="0">
-  <object x="96" y="32">
+  <object id="15" x="96" y="32">
    <polyline points="0,0 -32,0 -32,32 -64,64 -64,32 -32,0 -64,32 -64,-32"/>
   </object>
-  <object x="128" y="64">
+  <object id="16" x="128" y="64">
    <polyline points="0,0 0,32 -32,32 0,64 -32,96 32,96 32,-64 -32,-64 32,0 0,0"/>
   </object>
  </objectgroup>
  <objectgroup name="Polygone Crazy" visible="0">
-  <object x="0" y="0">
+  <object id="17" x="0" y="0">
    <polygon points="0,0 160,32 96,64 160,160 0,32 32,32"/>
   </object>
  </objectgroup>
  <objectgroup name="noffsetImageObject">
-  <object gid="4" x="128" y="96"/>
-  <object gid="3" x="32" y="96"/>
+  <object id="18" gid="4" x="128" y="96" width="64" height="64"/>
+  <object id="19" gid="3" x="32" y="96" width="64" height="64"/>
  </objectgroup>
  <objectgroup name="minGreen">
-  <object gid="5" x="32" y="32"/>
-  <object gid="6" x="160" y="32"/>
+  <object id="20" gid="5" x="32" y="32" width="64" height="64"/>
+  <object id="21" gid="6" x="160" y="32" width="64" height="64"/>
  </objectgroup>
  <objectgroup name="tallBlue">
-  <object gid="7" x="96" y="160"/>
-  <object gid="7" x="64" y="128"/>
+  <object id="22" gid="7" x="96" y="160" width="64" height="72"/>
+  <object id="23" gid="7" x="64" y="128" width="64" height="72"/>
  </objectgroup>
  <objectgroup name="normalBlue_XOffset">
-  <object gid="8" x="160" y="160"/>
+  <object id="24" gid="8" x="160" y="160" width="75" height="64"/>
  </objectgroup>
 </map>
diff --git a/testmaps/maps/iso/Isometric_cubes_with_objects_large.tmx b/testmaps/maps/iso/Isometric_cubes_with_objects_large.tmx
index d0b0719..d9a34bc 100644
--- a/testmaps/maps/iso/Isometric_cubes_with_objects_large.tmx
+++ b/testmaps/maps/iso/Isometric_cubes_with_objects_large.tmx
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="isometric" renderorder="right-down" width="100" height="100" tilewidth="64" tileheight="32">
+<map version="1.0" orientation="isometric" renderorder="right-down" width="100" height="100" tilewidth="64" tileheight="32" nextobjectid="11">
  <properties>
   <property name="interactive" value="true"/>
  </properties>
- <tileset firstgid="1" name="greyBlack" tilewidth="64" tileheight="64" spacing="1" margin="1">
+ <tileset firstgid="1" name="greyBlack" tilewidth="64" tileheight="64" spacing="1" margin="1" tilecount="2" columns="2">
   <tileoffset x="0" y="32"/>
   <properties>
-   <property name="hitArea" value="32,-32,0,-48,32,-64,64,-48"/>
+   <property name="hitArea" value="[32,-32,0,-48,32,-64,64,-48]"/>
   </properties>
   <image source="../gfx/png/greyBlack.png" trans="ff00ff" width="131" height="66"/>
  </tileset>
- <tileset firstgid="3" name="singleTallBall" tilewidth="64" tileheight="72" spacing="1" margin="1">
+ <tileset firstgid="3" name="singleTallBall" tilewidth="64" tileheight="72" spacing="1" margin="1" tilecount="1" columns="1">
   <tileoffset x="0" y="40"/>
   <image source="../gfx/png/singleTallBall.png" trans="ff00ff" width="66" height="74"/>
  </tileset>
- <tileset firstgid="4" name="miniGreen" tilewidth="64" tileheight="64" spacing="1" margin="1">
+ <tileset firstgid="4" name="miniGreen" tilewidth="64" tileheight="64" spacing="1" margin="1" tilecount="2" columns="2">
   <tileoffset x="0" y="32"/>
   <image source="../gfx/png/miniGreen.png" trans="ff00ff" width="131" height="66"/>
  </tileset>
@@ -24,17 +24,17 @@
   </data>
  </layer>
  <objectgroup name="Object Layer 1">
-  <object gid="3" x="128" y="64"/>
-  <object gid="3" x="256" y="128"/>
-  <object x="128" y="416"/>
-  <object gid="3" x="160" y="384"/>
+  <object id="1" gid="3" x="128" y="64" width="64" height="72"/>
+  <object id="2" gid="3" x="256" y="128" width="64" height="72"/>
+  <object id="3" x="128" y="416"/>
+  <object id="4" gid="3" x="160" y="384" width="64" height="72"/>
  </objectgroup>
  <objectgroup name="Object Layer 2">
-  <object gid="4" x="32" y="128"/>
-  <object gid="4" x="352" y="288"/>
-  <object gid="4" x="416" y="288"/>
-  <object gid="4" x="256" y="512"/>
-  <object gid="4" x="384" y="576"/>
-  <object x="224" y="512"/>
+  <object id="5" gid="4" x="32" y="128" width="64" height="64"/>
+  <object id="6" gid="4" x="352" y="288" width="64" height="64"/>
+  <object id="7" gid="4" x="416" y="288" width="64" height="64"/>
+  <object id="8" gid="4" x="256" y="512" width="64" height="64"/>
+  <object id="9" gid="4" x="384" y="576" width="64" height="64"/>
+  <object id="10" x="224" y="512"/>
  </objectgroup>
 </map>