2 files changed, 15 insertions, 3 deletions
diff --git a/include/rodeo/collision.h b/include/rodeo/collision.h
index a8ec07f..277b780 100644
--- a/include/rodeo/collision.h
+++ b/include/rodeo/collision.h
@@ -19,14 +19,17 @@ rodeo_collision_2d_world_item_create(
 
 void
 rodeo_collision_2d_world_item_destroy(
-	rodeo_collision_2d_world_t *world,
 	cvec_collision_2d_world_item_value* cvec_value
 );
 
+void
+rodeo_collision_2d_world_item_destroy_by_id(
+    world_id id
+);
+
 rodeo_collision_2d_world_item_t*
 rodeo_collision_2d_world_item_get_by_id(
-	rodeo_collision_2d_world_t *world,
-    uint32_t id
+    world_id id
 );
 
 void
diff --git a/include/rodeo/collision_t.h b/include/rodeo/collision_t.h
index 19f5dbe..e75d243 100644
--- a/include/rodeo/collision_t.h
+++ b/include/rodeo/collision_t.h
@@ -4,10 +4,19 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+struct cvec_collision_2d_world_item;
+
 typedef
 struct
 {
 	uint32_t id;
+    struct cvec_collision_2d_world_item  *world;
+} world_id;
+
+typedef
+struct
+{
+    world_id id;
 	float x;
 	float y;
 	float dx;