Bump version to 5.1.149 (#4451 )

Update translations [skip ci] (#4430 )
Co-authored-by: ClementPasteau <ClementPasteau@users.noreply.github.com>
2025-10-15 10:19:04 +00:00 · 2022-10-28 11:23:50 +02:00 · 2022-10-28 11:20:33 +02:00 · 2022-10-28 11:11:24 +02:00 · 2022-10-27 21:48:52 +02:00 · 2022-10-27 10:23:05 +02:00
986 changed files with 52421 additions and 20059 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,7 +68,7 @@ jobs:

      - run:
          name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app"
+          command: rm -rf "newIDE/electron-app/dist/mac/GDevelop 5.app" && rm -rf "newIDE/electron-app/dist/mac-arm64/GDevelop 5.app"

      # Upload artifacts (CircleCI)
      - store_artifacts:
@@ -143,11 +143,11 @@ jobs:
      # Build GDevelop IDE (seems like we need to allow Node.js to use more space than usual)
      - run:
          name: Build GDevelop IDE
-          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux AppImage zip deb --publish=never
+          command: export NODE_OPTIONS="--max-old-space-size=7168" && cd newIDE/electron-app && npm run build -- --linux --publish=never

      - run:
          name: Clean dist folder to keep only installers/binaries.
-          command: rm -rf newIDE/electron-app/dist/linux-unpacked
+          command: rm -rf newIDE/electron-app/dist/linux-unpacked && rm -rf newIDE/electron-app/dist/linux-arm64-unpacked

      # Upload artifacts (CircleCI)
      - store_artifacts:
--- a/.github/ISSUE_TEMPLATE/--asset-store-submission.md
+++ b/.github/ISSUE_TEMPLATE/--asset-store-submission.md
@@ -0,0 +1,19 @@
+---
+name: "📦 Asset Store submission"
+about: Submit a free asset pack for the GDevelop Asset Store.
+title: ''
+labels: "📦 Asset Store submission" 
+assignees: ''
+
+---
+
+BEFORE opening a new submission, please make sure that you:
+
+- You have packaged the asset pack according [these rules](https://wiki.gdevelop.io/gdevelop5/community/contribute-to-the-assets-store). Otherwise, your package may be rejected or we will ask you to do the changes.
+
+## Description
+
+- License:
+- Author:
+- Link to the original website:
+- Zip file:
--- a/Core/GDCore/Extensions/Builtin/AudioExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/AudioExtension.cpp
@@ -73,9 +73,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(

  extension
      .AddAction("RePlaySoundCanal",
-                 _("Play the sound of a channel"),
-                 _("Play the sound of the channel."),
-                 _("Play the sound of channel _PARAM1_"),
+                 _("Resume playing a sound on a channel"),
+                 _("Resume playing a sound on a channel that was paused."),
+                 _("Resume the sound of channel _PARAM1_"),
                 _("Sounds on channels"),
                 "res/actions/son24.png",
                 "res/actions/son.png")
@@ -132,9 +132,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(

  extension
      .AddAction("RePlayMusicCanal",
-                 _("Play the music of a channel"),
-                 _("Play the music of the channel."),
-                 _("Play the music of channel _PARAM1_"),
+                 _("Resume playing a music on a channel"),
+                 _("Resume playing a music on a channel that was paused."),
+                 _("Resume the music of channel _PARAM1_"),
                 _("Music on channels"),
                 "res/actions/music24.png",
                 "res/actions/music.png")
--- a/Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp
@@ -28,7 +28,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
  extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
      .SetIcon("res/actions/force24.png");

-  gd::ObjectMetadata& obj = extension.AddObject<gd::Object>(
+  gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
      "", _("Base object"), _("Base object"), "res/objeticon24.png");

  obj.AddCondition("PosX",
@@ -36,8 +36,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   _("Compare the X position of the object."),
                   _("the X position"),
                   _("Position"),
-                   "res/conditions/position24.png",
-                   "res/conditions/position.png")
+                   "res/conditions/position24_black.png",
+                   "res/conditions/position_black.png")

      .AddParameter("object", _("Object"))
      .UseStandardRelationalOperatorParameters("number")
@@ -48,8 +48,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Change the X position of an object."),
                _("the X position"),
                _("Position"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")

      .AddParameter("object", _("Object"))
      .UseStandardOperatorParameters("number")
@@ -60,8 +60,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   _("Compare the Y position of an object."),
                   _("the Y position"),
                   _("Position"),
-                   "res/conditions/position24.png",
-                   "res/conditions/position.png")
+                   "res/conditions/position24_black.png",
+                   "res/conditions/position_black.png")

      .AddParameter("object", _("Object"))
      .UseStandardRelationalOperatorParameters("number")
@@ -72,8 +72,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Change the Y position of an object."),
                _("the Y position"),
                _("Position"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")

      .AddParameter("object", _("Object"))
      .UseStandardOperatorParameters("number")
@@ -85,8 +85,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Change the position of _PARAM0_: _PARAM1_ _PARAM2_ (x "
                  "axis), _PARAM3_ _PARAM4_ (y axis)"),
                _("Position"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")

      .AddParameter("object", _("Object"))
      .AddParameter("operator", _("Modification's sign"), "number")
@@ -102,8 +102,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "_PARAM2_ (x "
                  "axis), _PARAM3_ _PARAM4_ (y axis)"),
                _("Position/Center"),
-                "res/actions/position24.png",
-                "res/actions/position.png")
+                "res/actions/position24_black.png",
+                "res/actions/position_black.png")
      .AddParameter("object", _("Object"))
      .AddParameter("operator", _("Modification's sign"), "number")
      .AddParameter("expression", _("X position"))
@@ -118,7 +118,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("the X position of the center of rotation"),
         _("the X position of the center"),
         _("Position/Center"),
-         "res/actions/position24.png")
+         "res/actions/position24_black.png")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -129,7 +129,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("the Y position of the center of rotation"),
         _("the Y position of the center"),
         _("Position/Center"),
-         "res/actions/position24.png")
+         "res/actions/position24_black.png")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -140,7 +140,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                  "the object) left position"),
                                _("the bounding box left position"),
                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-left.svg")
+                                "res/conditions/bounding-box-left_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -151,7 +151,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("the bounding box (the area encapsulating the object) top position"),
         _("the bounding box top position"),
         _("Position/Bounding Box"),
-         "res/conditions/bounding-box-top.svg")
+         "res/conditions/bounding-box-top_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -162,7 +162,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                  "the object) right position"),
                                _("the bounding box right position"),
                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-right.svg")
+                                "res/conditions/bounding-box-right_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -173,7 +173,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                  "the object) bottom position"),
                                _("the bounding box bottom position"),
                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-bottom.svg")
+                                "res/conditions/bounding-box-bottom_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -184,7 +184,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                  "the object) center X position"),
                                _("the bounding box center X position"),
                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center.svg")
+                                "res/conditions/bounding-box-center_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -195,7 +195,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                  "the object) center Y position"),
                                _("the bounding box center Y position"),
                                _("Position/Bounding Box"),
-                                "res/conditions/bounding-box-center.svg")
+                                "res/conditions/bounding-box-center_black.svg")
      .AddParameter("object", _("Object"))
      .UseStandardParameters("number");

@@ -222,8 +222,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                _("Change the angle of rotation of an object (in degrees)."),
                _("the angle"),
                _("Angle"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/direction24_black.png",
+                "res/actions/direction_black.png")

      .AddParameter("object", _("Object"))
      .UseStandardOperatorParameters("number");
@@ -234,8 +234,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "counterclockwise otherwise."),
                _("Rotate _PARAM0_ at speed _PARAM1_ deg/second"),
                _("Angle"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/rotate24_black.png",
+                "res/actions/rotate_black.png")

      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angular speed (in degrees per second)"))
@@ -248,8 +248,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Rotate an object towards an angle with the specified speed."),
         _("Rotate _PARAM0_ towards _PARAM1_ at speed _PARAM2_ deg/second"),
         _("Angle"),
-         "res/actions/direction24.png",
-         "res/actions/direction.png")
+         "res/actions/rotate24_black.png",
+         "res/actions/rotate_black.png")

      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle to rotate towards (in degrees)"))
@@ -264,8 +264,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         _("Rotate _PARAM0_ towards _PARAM1_;_PARAM2_ at speed "
           "_PARAM3_ deg/second"),
         _("Angle"),
-         "res/actions/direction24.png",
-         "res/actions/direction.png")
+         "res/actions/rotate24_black.png",
+         "res/actions/rotate_black.png")

      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("X position"))
@@ -393,7 +393,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/layer.png")

      .AddParameter("object", _("Object"))
-      .AddParameter("layer", _("Move it to this layer (base layer if empty)"))
+      .AddParameter("layer", _("Move it to this layer"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

@@ -512,8 +512,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   _("Compare the angle of the specified object."),
                   _("the angle (in degrees)"),
                   _("Angle"),
-                   "res/conditions/direction24.png",
-                   "res/conditions/direction.png")
+                   "res/conditions/direction24_black.png",
+                   "res/conditions/direction_black.png")

      .AddParameter("object", _("Object"))
      .UseStandardRelationalOperatorParameters("number")
@@ -886,7 +886,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         "res/conditions/timer24.png",
         "res/conditions/timer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .AddParameter("expression", _("Time in seconds"))
      .SetHidden();

@@ -900,7 +900,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         "res/conditions/timer24.png",
         "res/conditions/timer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .AddParameter("relationalOperator", _("Sign of the test"), "time")
      .AddParameter("expression", _("Time in seconds"))
      .SetManipulatedType("number");
@@ -913,7 +913,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                   "res/conditions/timerPaused24.png",
                   "res/conditions/timerPaused.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .MarkAsAdvanced();

  obj.AddAction(
@@ -926,7 +926,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
         "res/actions/timer24.png",
         "res/actions/timer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");

  obj.AddAction("PauseObjectTimer",
                _("Pause an object timer"),
@@ -936,7 +936,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/pauseTimer24.png",
                "res/actions/pauseTimer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .MarkAsAdvanced();

  obj.AddAction("UnPauseObjectTimer",
@@ -947,7 +947,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/unPauseTimer24.png",
                "res/actions/unPauseTimer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .MarkAsAdvanced();

  obj.AddAction("RemoveObjectTimer",
@@ -958,28 +958,28 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                "res/actions/timer24.png",
                "res/actions/timer.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "objectTimer")
      .MarkAsAdvanced();

  obj.AddExpression("X",
                    _("X position"),
                    _("X position of the object"),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .AddParameter("object", _("Object"));

  obj.AddExpression("Y",
                    _("Y position"),
                    _("Y position of the object"),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .AddParameter("object", _("Object"));

  obj.AddExpression("Angle",
                    _("Angle"),
                    _("Current angle, in degrees, of the object"),
                    _("Angle"),
-                    "res/actions/direction.png")
+                    "res/actions/direction_black.png")
      .AddParameter("object", _("Object"));

  obj.AddExpression("ForceX",
@@ -1022,14 +1022,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Width"),
                    _("Width of the object"),
                    _("Size"),
-                    "res/actions/scaleWidth.png")
+                    "res/actions/scaleWidth_black.png")
      .AddParameter("object", _("Object"));

  obj.AddExpression("Largeur",
                    _("Width"),
                    _("Width of the object"),
                    _("Size"),
-                    "res/actions/scaleWidth.png")
+                    "res/actions/scaleWidth_black.png")
      .AddParameter("object", _("Object"))
      .SetHidden();

@@ -1037,14 +1037,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Height"),
                    _("Height of the object"),
                    _("Size"),
-                    "res/actions/scaleHeight.png")
+                    "res/actions/scaleHeight_black.png")
      .AddParameter("object", _("Object"));

  obj.AddExpression("Hauteur",
                    _("Height"),
                    _("Height of the object"),
                    _("Size"),
-                    "res/actions/scaleHeight.png")
+                    "res/actions/scaleHeight_black.png")
      .AddParameter("object", _("Object"))
      .SetHidden();

@@ -1098,7 +1098,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("expression", _("Target Y position"));

  obj.AddExpression("Variable",
-                    _("Object variable"),
+                    _("Value of an object variable"),
                    _("Value of an object variable"),
                    _("Variables"),
                    "res/actions/var.png")
@@ -1114,7 +1114,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
      .AddParameter("objectvar", _("Variable"));

  obj.AddStrExpression("VariableString",
-                       _("Object variable"),
+                       _("Text of an object variable"),
                       _("Text of an object variable"),
                       _("Variables"),
                       "res/actions/var.png")
@@ -1127,7 +1127,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    _("Object timers"),
                    "res/actions/time.png")
      .AddParameter("object", _("Object"))
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "objectTimer");

  obj.AddExpression("AngleToObject",
                    _("Angle between two objects"),
@@ -1135,7 +1135,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "If you need the angle to an arbitrary position, "
                      "use AngleToPosition."),
                    _("Angle"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .AddParameter("object", _("Object"))
      .AddParameter("objectPtr", _("Object"));

@@ -1146,7 +1146,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "getting the cartesian coordinates of a 2D vector, using "
                      "its polar coordinates."),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Distance"));
@@ -1158,7 +1158,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "getting the cartesian coordinates of a 2D vector, using "
                      "its polar coordinates."),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Distance"));
@@ -1169,7 +1169,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "\"target\" position (in degrees). If you need the angle "
                      "between two objects, use AngleToObject."),
                    _("Angle"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Target X position"))
      .AddParameter("expression", _("Target Y position"));
@@ -1529,7 +1529,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
            "object will become the only one taken into account.\nIf "
            "the condition is inverted, the object to be intersected "
            "will be the farthest one within the ray radius."),
-          _("Cast a ray from from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
+          _("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
            "against _PARAM0_, and save the "
            "result in _PARAM5_, _PARAM6_"),
          "",
@@ -1565,7 +1565,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                       _("Object name"),
                       _("Return the name of the object"),
                       "",
-                       "res/conditions/text.png")
+                       "res/conditions/text_black.png")
      .AddParameter("object", _("Object"));

  obj.AddStrExpression("Layer",
--- a/Core/GDCore/Extensions/Builtin/CameraExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CameraExtension.cpp
@@ -22,6 +22,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
          "object or a position.",
          "Florian Rival",
          "Open source (MIT License)")
+      .SetCategory("Camera")
      .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
  extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
      .SetIcon("res/conditions/camera24.png");
@@ -221,7 +222,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Width"), "", true)
      .AddParameter("expression", _("Height"), "", true)
@@ -256,7 +257,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number"))
      .MarkAsComplex();
@@ -272,7 +273,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number"))
      .AddParameter("expression", _("Width"))
@@ -290,7 +291,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/camera24.png",
                 "res/actions/camera.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .AddParameter("expression", _("Camera number"))
      .AddParameter(
@@ -309,7 +310,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(

  extension
      .AddAction("ZoomCamera",
-                 _("Change camera zoom"),
+                 _("Camera zoom"),
                 _("Change camera zoom."),
                 _("Change camera zoom to _PARAM1_ (layer: _PARAM2_, camera: "
                   "_PARAM3_)"),
@@ -413,7 +414,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/layer24.png",
                 "res/actions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

@@ -426,7 +427,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "res/actions/layer24.png",
                 "res/actions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

@@ -439,7 +440,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                    "res/conditions/layer24.png",
                    "res/conditions/layer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer (base layer if empty)"))
+      .AddParameter("layer", _("Layer"))
      .SetDefaultValue("\"\"")
      .MarkAsAdvanced();

@@ -576,7 +577,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(

  extension
      .AddAction("SetLayerDefaultZOrder",
-                 _("Change layer default Z order"),
+                 _("Layer default Z order"),
                 _("Change the default Z order set to objects when they are "
                   "created on a layer."),
                 _("Set the default Z order of objects created on _PARAM1_ to "
--- a/Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CommonConversionsExtension.cpp
@@ -21,14 +21,14 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/common-conversions");
  extension.AddInstructionOrExpressionGroupMetadata(_("Conversion"))
-      .SetIcon("res/conditions/toujours24.png");
+      .SetIcon("res/conditions/toujours24_black.png");

  extension
      .AddExpression("ToNumber",
                     _("Text > Number"),
                     _("Convert the text to a number"),
                     "",
-                     "res/conditions/toujours24.png")
+                     "res/conditions/toujours24_black.png")
      .AddParameter("string", _("Text to convert to a number"));

  extension
@@ -36,7 +36,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Number > Text"),
                        _("Convert the result of the expression to text"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
      .AddParameter("expression", _("Expression to be converted to text"));

  extension
@@ -45,7 +45,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert the result of the expression to text, "
                          "without using the scientific notation"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
      .AddParameter("expression", _("Expression to be converted to text"));

  extension
@@ -54,7 +54,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          _("Degrees > Radians"),
          _("Converts the angle, expressed in degrees, into radians"),
          "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.png")
      .AddParameter("expression", _("Angle, in degrees"));

  extension
@@ -63,7 +63,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
          _("Radians > Degrees"),
          _("Converts the angle, expressed in radians, into degrees"),
          "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.png")
      .AddParameter("expression", _("Angle, in radians"));

  extension
@@ -71,7 +71,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert scene variable to JSON"),
                        _("Convert a scene variable to JSON"),
                        _("JSON"),
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
      .AddParameter("scenevar", _("Scene variable to be stringified"));

  extension
@@ -79,7 +79,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert global variable to JSON"),
                        _("Convert a global variable to JSON"),
                        _("JSON"),
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
      .AddParameter("globalvar", _("The global variable to be stringified"));

  extension
@@ -87,7 +87,7 @@ BuiltinExtensionsImplementer::ImplementsCommonConversionsExtension(
                        _("Convert object variable to JSON"),
                        _("Convert an object variable to JSON"),
                        _("JSON"),
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")
      .AddParameter("objectPtr", _("The object with the variable"))
      .AddParameter("objectvar", _("The object variable to be stringified"));

--- a/Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/CommonInstructionsExtension.cpp
@@ -33,7 +33,7 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
      .SetExtensionHelpPath("/all-features/advanced-conditions");
  extension
      .AddInstructionOrExpressionGroupMetadata(_("Events and control flow"))
-      .SetIcon("res/conditions/toujours24.png");
+      .SetIcon("res/conditions/toujours24_black.png");

  extension
      .AddCondition("Always",
@@ -42,8 +42,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                      "the condition is inverted)."),
                    _("Always"),
                    "",
-                    "res/conditions/toujours24.png",
-                    "res/conditions/toujours.png")
+                    "res/conditions/toujours24_black.png",
+                    "res/conditions/toujours_black.png")
      .SetHelpPath("/all-features/advanced-conditions")
      .AddCodeOnlyParameter("conditionInverted", "")
      .MarkAsAdvanced();
@@ -61,8 +61,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Check if one of the sub conditions is true"),
                    _("If one of these conditions is true:"),
                    "",
-                    "res/conditions/or24.png",
-                    "res/conditions/or.png")
+                    "res/conditions/or24_black.png",
+                    "res/conditions/or_black.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

@@ -72,8 +72,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Check if all sub conditions are true"),
                    _("If all of these conditions are true:"),
                    "",
-                    "res/conditions/and24.png",
-                    "res/conditions/and.png")
+                    "res/conditions/and24_black.png",
+                    "res/conditions/and_black.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

@@ -84,8 +84,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
          _("Return the contrary of the result of the sub conditions"),
          _("Invert the logical result of these conditions:"),
          "",
-          "res/conditions/not24.png",
-          "res/conditions/not.png")
+          "res/conditions/not24_black.png",
+          "res/conditions/not_black.png")
      .SetCanHaveSubInstructions()
      .MarkAsAdvanced();

@@ -104,8 +104,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Compare the two numbers."),
                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
                    "",
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
+                    "res/conditions/egal24_black.png",
+                    "res/conditions/egal_black.png")
      .SetHelpPath("/all-features/advanced-conditions")
      .AddParameter("expression", _("First expression"))
      .AddParameter("relationalOperator", _("Sign of the test"), "number")
@@ -125,8 +125,8 @@ BuiltinExtensionsImplementer::ImplementsCommonInstructionsExtension(
                    _("Compare the two strings."),
                    _("_PARAM0_ _PARAM1_ _PARAM2_"),
                    "",
-                    "res/conditions/egal24.png",
-                    "res/conditions/egal.png")
+                    "res/conditions/egal24_black.png",
+                    "res/conditions/egal_black.png")
      .SetHelpPath("/all-features/advanced-conditions")
      .AddParameter("string", _("First string expression"))
      .AddParameter("relationalOperator", _("Sign of the test"), "string")
--- a/Core/GDCore/Extensions/Builtin/FileExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/FileExtension.cpp
@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
          "Florian Rival",
          "Open source (MIT License)")
      .SetExtensionHelpPath("/all-features/storage")
-      .SetCategory("Device");
+      .SetCategory("Advanced");
  extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
      .SetIcon("res/conditions/fichier24.png");

--- a/Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/MathematicalToolsExtension.cpp
@@ -485,6 +485,13 @@ BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtension(
      .AddParameter("expression", _("Angle, in degrees"))
      .AddParameter("expression", _("Distance"));

+  extension
+      .AddExpression("Pi",
+                     _("Number Pi (3.1415...)"),
+                     _("The number Pi (3.1415...)"),
+                     "",
+                     "res/mathfunction.png")
+      .SetHelpPath("/all-features/expressions");
 }

 }  // namespace gd
--- a/Core/GDCore/Extensions/Builtin/SceneExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/SceneExtension.cpp
@@ -112,7 +112,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(

  extension
      .AddAction("SceneBackground",
-                 _("Change background color"),
+                 _("Background color"),
                 _("Change the background color of the scene."),
                 _("Set background color to _PARAM1_"),
                 "",
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp
@@ -22,6 +22,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                               "Florian Rival",
                               "Open source (MIT License)")
      .SetExtensionHelpPath("/objects/sprite");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Sprite"))
+      .SetIcon("CppPlatform/Extensions/spriteicon.png");

  gd::ObjectMetadata& obj =
      extension
@@ -33,7 +35,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
          .SetCategoryFullName(_("General"));

  obj.AddAction("Opacity",
-                _("Change sprite opacity"),
+                _("Sprite opacity"),
                _("Change the opacity of a Sprite. 0 is fully transparent, 255 "
                  "is opaque (default)."),
                _("the opacity"),
@@ -79,8 +81,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           "is in 8 directions mode, the valid directions are 0..7"),
         _("the direction"),
         _("Direction"),
-         "res/actions/direction24.png",
-         "res/actions/direction.png")
+         "res/actions/direction24_black.png",
+         "res/actions/direction_black.png")
      .SetHidden()  // Hide as 8 direction is not supported officially in the
                    // interface.
      .AddParameter("object", _("Object"), "Sprite")
@@ -140,8 +142,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "Rotate an object towards a position.",
                "Rotate _PARAM0_ towards _PARAM1_;_PARAM2_",
                _("Direction"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/rotate24_black.png",
+                "res/actions/rotate_black.png")

      .AddParameter("object", _("Object to be rotated"), "Sprite")
      .AddParameter("expression", _("X position"))
@@ -156,8 +158,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Modify the scale of the specified object."),
                _("the scale"),
                _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scale24_black.png",
+                "res/actions/scale_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardOperatorParameters("number")
@@ -168,8 +170,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Modify the scale of the width of an object."),
                _("the width's scale"),
                _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleWidth24_black.png",
+                "res/actions/scaleWidth_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardOperatorParameters("number")
@@ -180,8 +182,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Modify the scale of the height of an object."),
                _("the height's scale"),
                _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleHeight24_black.png",
+                "res/actions/scaleHeight_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardOperatorParameters("number")
@@ -192,8 +194,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Change the width of a Sprite object."),
                _("the width"),
                _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleWidth24_black.png",
+                "res/actions/scaleWidth_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardOperatorParameters("number")
@@ -204,8 +206,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   _("Compare the width of a Sprite object."),
                   _("the width"),
                   _("Size"),
-                   "res/conditions/scaleWidth24.png",
-                   "res/conditions/scaleWidth.png")
+                   "res/conditions/scaleWidth24_black.png",
+                   "res/conditions/scaleWidth_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardRelationalOperatorParameters("number")
@@ -216,8 +218,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Change the height of a Sprite object."),
                _("the height"),
                _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scaleHeight24_black.png",
+                "res/actions/scaleHeight_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardOperatorParameters("number")
@@ -228,8 +230,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   _("Compare the height of a Sprite object."),
                   _("the height"),
                   _("Size"),
-                   "res/conditions/scaleHeight24.png",
-                   "res/conditions/scaleHeight.png")
+                   "res/conditions/scaleHeight24_black.png",
+                   "res/conditions/scaleHeight_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardRelationalOperatorParameters("number")
@@ -240,8 +242,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                _("Change the size of an object."),
                _("Change the size of _PARAM0_: set to _PARAM1_x_PARAM2_"),
                _("Size"),
-                "res/actions/scale24.png",
-                "res/actions/scale.png")
+                "res/actions/scale24_black.png",
+                "res/actions/scale_black.png")

      .AddParameter("object", _("Object"))
      .AddParameter("expression", _("Width"))
@@ -281,8 +283,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
           "from 0 to 7. Otherwise, the direction is in degrees."),
         _("the direction"),
         _("Direction"),
-         "res/conditions/direction24.png",
-         "res/conditions/direction.png")
+         "res/conditions/direction24_black.png",
+         "res/conditions/direction_black.png")
      .SetHidden()  // Hide as 8 direction is not supported officially in the
                    // interface.
      .AddParameter("object", _("Object"), "Sprite")
@@ -330,8 +332,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   _("Compare the scale of the width of an object."),
                   _("the width's scale"),
                   _("Size"),
-                   "res/conditions/scaleWidth24.png",
-                   "res/conditions/scaleWidth.png")
+                   "res/conditions/scaleWidth24_black.png",
+                   "res/conditions/scaleWidth_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardRelationalOperatorParameters("number")
@@ -342,8 +344,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                   _("Compare the scale of the height of an object."),
                   _("the height's scale"),
                   _("Size"),
-                   "res/conditions/scaleHeight24.png",
-                   "res/conditions/scaleHeight.png")
+                   "res/conditions/scaleHeight24_black.png",
+                   "res/conditions/scaleHeight_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .UseStandardRelationalOperatorParameters("number")
@@ -449,8 +451,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                "Rotate an object towards another.",
                "Rotate _PARAM0_ towards _PARAM1_",
                _("Direction"),
-                "res/actions/direction24.png",
-                "res/actions/direction.png")
+                "res/actions/rotate24_black.png",
+                "res/actions/rotate_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPtr", "Rotate toward this object")
@@ -461,7 +463,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("X position of a point"),
                    _("X position of a point"),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -470,7 +472,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Y position of a point"),
                    _("Y position of a point"),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"), "", true);
@@ -479,7 +481,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("X position of a point"),
                    _("X position of a point"),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"));
@@ -488,7 +490,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Y position of a point"),
                    _("Y position of a point"),
                    _("Position"),
-                    "res/actions/position.png")
+                    "res/actions/position_black.png")

      .AddParameter("object", _("Object"), "Sprite")
      .AddParameter("objectPointName", _("Name of the point"));
@@ -497,7 +499,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Direction"),
                    _("Direction of the object"),
                    _("Direction"),
-                    "res/actions/direction.png")
+                    "res/actions/direction_black.png")
      .SetHidden()
      .AddParameter("object", _("Object"), "Sprite");

@@ -505,7 +507,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Direction"),
                    _("Direction of the object"),
                    _("Direction"),
-                    "res/actions/direction.png")
+                    "res/actions/direction_black.png")
      .SetHidden()  // Hide as 8 direction is not supported officially in the
                    // interface.
      .AddParameter("object", _("Object"), "Sprite");
@@ -550,14 +552,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                    _("Scale of the width of an object"),
                    _("Scale of the width of an object"),
                    _("Size"),
-                    "res/actions/scaleWidth.png")
+                    "res/actions/scaleWidth_black.png")
      .AddParameter("object", _("Object"), "Sprite");

  obj.AddExpression("ScaleY",
                    _("Scale of the height of an object"),
                    _("Scale of the height of an object"),
                    _("Size"),
-                    "res/actions/scaleHeight.png")
+                    "res/actions/scaleHeight_black.png")
      .AddParameter("object", _("Object"), "Sprite");

  obj.AddExpression("Opacity",
--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp
@@ -25,8 +25,7 @@ namespace gd {

 Animation SpriteObject::badAnimation;

-SpriteObject::SpriteObject(gd::String name_)
-    : Object(name_), updateIfNotVisible(false) {}
+SpriteObject::SpriteObject() : updateIfNotVisible(false) {}

 SpriteObject::~SpriteObject(){};

--- a/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h
+++ b/Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h
@@ -36,11 +36,11 @@ namespace gd {
 * \see gd::BuiltinExtensionsImplementer::ImplementsSpriteExtension
 * \ingroup SpriteObjectExtension
 */
-class GD_CORE_API SpriteObject : public gd::Object {
+class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
 public:
-  SpriteObject(gd::String name_);
+  SpriteObject();
  virtual ~SpriteObject();
-  std::unique_ptr<gd::Object> Clone() const override {
+  std::unique_ptr<gd::ObjectConfiguration> Clone() const override {
    return gd::make_unique<SpriteObject>(*this);
  }

--- a/Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp
@@ -21,20 +21,20 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
          "Open source (MIT License)")
      .SetExtensionHelpPath("" /*TODO: Add a documentation page for this */);
  extension.AddInstructionOrExpressionGroupMetadata(_("Text manipulation"))
-      .SetIcon("res/actions/text24.png");
+      .SetIcon("res/actions/text24_black.png");

  extension.AddStrExpression("NewLine",
                             _("Insert a new line"),
                             _("Insert a new line"),
                             "",
-                             "res/conditions/toujours24.png");
+                             "res/conditions/toujours24_black.png");

  extension
      .AddStrExpression("FromCodePoint",
                        _("Get character from code point"),
                        _("Get character from code point"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")

      .AddParameter("expression", _("Code point"));

@@ -43,7 +43,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Uppercase a text"),
                        _("Uppercase a text"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"));

@@ -52,7 +52,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Lowercase a text"),
                        _("Lowercase a text"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"));

@@ -61,7 +61,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Get a portion of a text"),
                        _("Get a portion of a text"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("expression",
@@ -74,7 +74,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Get a character from a text"),
                        _("Get a character from a text"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter(
@@ -86,7 +86,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                        _("Repeat a text"),
                        _("Repeat a text"),
                        "",
-                        "res/conditions/toujours24.png")
+                        "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text to repeat"))
      .AddParameter("expression", _("Repetition count"));
@@ -96,7 +96,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Length of a text"),
                     _("Length of a text"),
                     "",
-                     "res/conditions/toujours24.png")
+                     "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"));

@@ -106,7 +106,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Search in a text (return the position of the result or "
                       "-1 if not found)"),
                     "",
-                     "res/conditions/toujours24.png")
+                     "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"));
@@ -117,7 +117,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     "Search in a text from the end (return the position of "
                     "the result or -1 if not found)",
                     "",
-                     "res/conditions/toujours24.png")
+                     "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -131,7 +131,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
            "the result, from the beginning of the string, or -1 if not "
            "found)"),
          "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"));
@@ -142,7 +142,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Search in a text, starting from a position (return the "
                       "position of the result or -1 if not found)"),
                     "",
-                     "res/conditions/toujours24.png")
+                     "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -157,7 +157,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
          "Search in a text from the end, starting from a position (return "
          "the position of the result or -1 if not found)",
          "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
@@ -175,7 +175,7 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
            " the position of the result, from the beginning of the string, or "
            "-1 if not found)"),
          "",
-          "res/conditions/toujours24.png")
+          "res/conditions/toujours24_black.png")

      .AddParameter("string", _("Text"))
      .AddParameter("string", _("Text to search for"))
--- a/Core/GDCore/Extensions/Builtin/TimeExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/TimeExtension.cpp
@@ -36,7 +36,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
      .AddParameter("expression", _("Time in seconds"))
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
      .SetHidden();

  extension
@@ -50,7 +50,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/timer24.png",
                    "res/conditions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
      .AddParameter("relationalOperator", _("Sign of the test"), "time")
      .AddParameter("expression", _("Time in seconds"))
      .SetManipulatedType("number");
@@ -78,7 +78,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                    "res/conditions/timerPaused24.png",
                    "res/conditions/timerPaused.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
      .MarkAsAdvanced();

  extension
@@ -93,7 +93,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
          "res/actions/timer24.png",
          "res/actions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer");

  extension
      .AddAction("PauseTimer",
@@ -105,7 +105,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                 "res/actions/pauseTimer24.png",
                 "res/actions/pauseTimer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
      .MarkAsAdvanced();

  extension
@@ -118,7 +118,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                 "res/actions/unPauseTimer24.png",
                 "res/actions/unPauseTimer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
      .MarkAsAdvanced();

  extension
@@ -131,12 +131,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                 "res/actions/timer24.png",
                 "res/actions/timer.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"))
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer")
      .MarkAsAdvanced();

  extension
      .AddAction("ChangeTimeScale",
-                 _("Change time scale"),
+                 _("Time scale"),
                 _("Change the time scale of the scene."),
                 _("Set the time scale of the scene to _PARAM1_"),
                 "",
@@ -153,8 +153,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                   "the next actions (and sub-events)."),
                 _("Wait _PARAM0_ seconds"),
                 "",
-                 "res/timer.svg",
-                 "res/timer.svg")
+                 "res/timer_black.svg",
+                 "res/timer_black.svg")
      .AddParameter("expression", "Time to wait in seconds")
      .SetHelpPath("/all-features/timers-and-time/wait-action");

@@ -191,7 +191,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTimeExtension(
                     "",
                     "res/actions/time.png")
      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("string", _("Timer's name"));
+      .AddParameter("identifier", _("Timer's name"), "sceneTimer");

  extension
      .AddExpression("TimeFromStart",
--- a/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
+++ b/Core/GDCore/Extensions/Builtin/WindowExtension.cpp
@@ -20,6 +20,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
          "these features can be applied.",
          "Florian Rival",
          "Open source (MIT License)")
+      .SetCategory("User interface")
      .SetExtensionHelpPath("/all-features/window");
  extension
      .AddInstructionOrExpressionGroupMetadata(
@@ -55,7 +56,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetWindowMargins",
-                 _("Change the window's margins"),
+                 _("Window's margins"),
                 _("This action changes the margins, in pixels, between the "
                   "game frame and the window borders."),
                 _("Set margins of game window to "
@@ -71,7 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetGameResolutionSize",
-                 _("Change the resolution of the game"),
+                 _("Game resolution"),
                 _("Changes the resolution of the game, effectively changing "
                   "the game area size. This won't change the size of the "
                   "window in which the game is running."),
@@ -117,7 +118,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetGameResolutionResizeMode",
-                 _("Change the game resolution resize mode"),
+                 _("Game resolution resize mode"),
                 _("Set if the width or the height of the game resolution "
                   "should be changed to fit the game window - or if the game "
                   "resolution should not be updated automatically."),
@@ -153,7 +154,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetWindowIcon",
-                 _("Change the window's icon"),
+                 _("Window's icon"),
                 _("This action changes the icon of the game's window."),
                 _("Use _PARAM1_ as the icon for the game's window."),
                 "",
@@ -164,7 +165,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(

  extension
      .AddAction("SetWindowTitle",
-                 _("Change the window's title"),
+                 _("Window's title"),
                 _("This action changes the title of the game's window."),
                 _("Change window title to _PARAM1_"),
                 "",
--- a/Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp
@@ -14,12 +14,14 @@
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Tools/MakeUnique.h"
+#include "GDCore/Tools/Log.h"

 namespace gd {

 BehaviorMetadata::BehaviorMetadata(
    const gd::String& extensionNamespace_,
-    const gd::String& name_,
+    const gd::String& nameWithNamespace,
    const gd::String& fullname_,
    const gd::String& defaultName_,
    const gd::String& description_,
@@ -29,21 +31,50 @@ BehaviorMetadata::BehaviorMetadata(
    std::shared_ptr<gd::Behavior> instance_,
    std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance_)
    : extensionNamespace(extensionNamespace_),
+      className(className_),
+      iconFilename(icon24x24),
      instance(instance_),
-      sharedDatasInstance(sharedDatasInstance_) {
-#if defined(GD_IDE_ONLY)
+      sharedDatasInstance(sharedDatasInstance_),
+      isEventBased(false) {
  SetFullName(gd::String(fullname_));
  SetDescription(gd::String(description_));
  SetDefaultName(gd::String(defaultName_));
  SetGroup(group_);
-  className = className_;
-  iconFilename = icon24x24;
-#endif

-  if (instance) instance->SetTypeName(name_);
-  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(name_);
+  if (!instance) {
+    gd::LogFatalError(
+        "Trying to create a BehaviorMetadata that has no "
+        "behavior. This will crash - please double check that the "
+        "BehaviorMetadata is valid for: " + nameWithNamespace);
+  }
+
+  if (instance) instance->SetTypeName(nameWithNamespace);
+  if (sharedDatasInstance) sharedDatasInstance->SetTypeName(nameWithNamespace);
 }

+BehaviorMetadata::BehaviorMetadata(
+    const gd::String& extensionNamespace,
+    const gd::String& nameWithNamespace,
+    const gd::String& fullname_,
+    const gd::String& defaultName_,
+    const gd::String& description_,
+    const gd::String& group_,
+    const gd::String& icon24x24_): BehaviorMetadata(
+        extensionNamespace,
+        nameWithNamespace,
+        fullname_,
+        defaultName_,
+        description_,
+        group_,
+        icon24x24_,
+        // Class name is the name, actually unused
+        defaultName_,
+        // It is only used to get the name for GetName.
+        gd::make_unique<gd::Behavior>("", nameWithNamespace),
+        nullptr){
+  isEventBased = true;
+};
+
 gd::InstructionMetadata& BehaviorMetadata::AddCondition(
    const gd::String& name,
    const gd::String& fullname,
@@ -52,7 +83,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
    const gd::String& group,
    const gd::String& icon,
    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
  gd::String nameWithNamespace =
      extensionNamespace.empty() ? name : extensionNamespace + name;
  conditionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -66,7 +96,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddCondition(
                                           .SetHelpPath(GetHelpPath())
                                           .SetIsBehaviorInstruction();
  return conditionsInfos[nameWithNamespace];
-#endif
 }

 gd::InstructionMetadata& BehaviorMetadata::AddAction(
@@ -77,7 +106,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
    const gd::String& group,
    const gd::String& icon,
    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
  gd::String nameWithNamespace =
      extensionNamespace.empty() ? name : extensionNamespace + name;
  actionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -91,7 +119,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddAction(
                                        .SetHelpPath(GetHelpPath())
                                        .SetIsBehaviorInstruction();
  return actionsInfos[nameWithNamespace];
-#endif
 }

 gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
@@ -102,7 +129,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
    const gd::String& group,
    const gd::String& icon,
    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
  gd::String nameWithNamespace =
      GetName() + gd::PlatformExtension::GetNamespaceSeparator() + name;
  conditionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -116,7 +142,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedCondition(
                                           .SetHelpPath(GetHelpPath())
                                           .SetIsBehaviorInstruction();
  return conditionsInfos[nameWithNamespace];
-#endif
 }

 gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
@@ -127,7 +152,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
    const gd::String& group,
    const gd::String& icon,
    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
  gd::String nameWithNamespace =
      GetName() + gd::PlatformExtension::GetNamespaceSeparator() + name;
  actionsInfos[nameWithNamespace] = InstructionMetadata(extensionNamespace,
@@ -141,7 +165,6 @@ gd::InstructionMetadata& BehaviorMetadata::AddScopedAction(
                                        .SetHelpPath(GetHelpPath())
                                        .SetIsBehaviorInstruction();
  return actionsInfos[nameWithNamespace];
-#endif
 }

 gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
@@ -150,7 +173,6 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
    const gd::String& description,
    const gd::String& group,
    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
  // Be careful, behaviors expression do not have namespace (not necessary as
  // we refer to the behavior name in the expression).
  expressionsInfos[name] = ExpressionMetadata("number",
@@ -162,7 +184,6 @@ gd::ExpressionMetadata& BehaviorMetadata::AddExpression(
                                              smallicon)
                               .SetHelpPath(GetHelpPath());
  return expressionsInfos[name];
-#endif
 }

 gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
@@ -171,7 +192,6 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
    const gd::String& description,
    const gd::String& group,
    const gd::String& smallicon) {
-#if defined(GD_IDE_ONLY)
  // Be careful, behaviors expression do not have namespace (not necessary as
  // we refer to the behavior name in the expression).
  strExpressionsInfos[name] = ExpressionMetadata("string",
@@ -183,7 +203,6 @@ gd::ExpressionMetadata& BehaviorMetadata::AddStrExpression(
                                                 smallicon)
                                  .SetHelpPath(GetHelpPath());
  return strExpressionsInfos[name];
-#endif
 }

 gd::MultipleInstructionMetadata BehaviorMetadata::AddExpressionAndCondition(
@@ -288,7 +307,6 @@ BehaviorMetadata::AddExpressionAndConditionAndAction(
      expression, condition, action);
 }

-#if defined(GD_IDE_ONLY)
 gd::InstructionMetadata& BehaviorMetadata::AddDuplicatedAction(
    const gd::String& newActionName, const gd::String& copiedActionName) {
  gd::String newNameWithNamespace = extensionNamespace + newActionName;
@@ -356,49 +374,44 @@ gd::ExpressionMetadata& BehaviorMetadata::AddDuplicatedStrExpression(

  return strExpressionsInfos[newNameWithNamespace];
 }
-#endif

 BehaviorMetadata& BehaviorMetadata::SetFullName(const gd::String& fullname_) {
-#if defined(GD_IDE_ONLY)
  fullname = fullname_;
-#endif
  return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetDefaultName(
    const gd::String& defaultName_) {
-#if defined(GD_IDE_ONLY)
  defaultName = defaultName_;
-#endif
  return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetDescription(
    const gd::String& description_) {
-#if defined(GD_IDE_ONLY)
  description = description_;
-#endif
  return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetGroup(const gd::String& group_) {
-#if defined(GD_IDE_ONLY)
  group = group_;
-#endif
  return *this;
 }
 BehaviorMetadata& BehaviorMetadata::SetIncludeFile(
    const gd::String& includeFile) {
-#if defined(GD_IDE_ONLY)
  includeFiles.clear();
  includeFiles.push_back(includeFile);
-#endif
  return *this;
 }
 BehaviorMetadata& BehaviorMetadata::AddIncludeFile(
    const gd::String& includeFile) {
-#if defined(GD_IDE_ONLY)
  if (std::find(includeFiles.begin(), includeFiles.end(), includeFile) ==
      includeFiles.end())
    includeFiles.push_back(includeFile);
-#endif
+  return *this;
+}
+
+BehaviorMetadata& BehaviorMetadata::AddRequiredFile(
+    const gd::String& requiredFile) {
+  if (std::find(requiredFiles.begin(), requiredFiles.end(), requiredFile) ==
+      requiredFiles.end())
+    requiredFiles.push_back(requiredFile);
  return *this;
 }

@@ -407,13 +420,25 @@ const gd::String& BehaviorMetadata::GetName() const {
 }

 gd::Behavior& BehaviorMetadata::Get() const {
-  if (!instance)
+  if (isEventBased) {
+    gd::LogFatalError("Error: Event-based behaviors don't have blueprint. "
+                      "This method should not never be called.");
+  }
+  if (!instance) {
    gd::LogFatalError(
        "Trying to get a behavior from a BehaviorMetadata that has no "
        "behavior. This will crash - please double check that the "
-        "BehaviorMetadata is valid.");
-
+        "BehaviorMetadata is valid for: " + className);
+  }
  return *instance;
 }

+gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
+  if (isEventBased) {
+    gd::LogFatalError("Error: Event-based behaviors don't have blueprint. "
+                      "This method should not never be called.");
+  }
+  return sharedDatasInstance.get();
+}
+
 }  // namespace gd
--- a/Core/GDCore/Extensions/Metadata/BehaviorMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/BehaviorMetadata.h
@@ -29,7 +29,7 @@ class GD_CORE_API BehaviorMetadata {
 public:
  BehaviorMetadata(
      const gd::String& extensionNamespace,
-      const gd::String& name_,
+      const gd::String& nameWithNamespace,
      const gd::String& fullname_,
      const gd::String& defaultName_,
      const gd::String& description_,
@@ -38,6 +38,21 @@ class GD_CORE_API BehaviorMetadata {
      const gd::String& className_,
      std::shared_ptr<gd::Behavior> instance,
      std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
+      
+  /**
+   * \brief Construct a behavior metadata, without "blueprint" behavior.
+   * 
+   * \note This is used by events based behaviors.
+   */
+  BehaviorMetadata(
+      const gd::String& extensionNamespace,
+      const gd::String& nameWithNamespace,
+      const gd::String& fullname_,
+      const gd::String& defaultName_,
+      const gd::String& description_,
+      const gd::String& group_,
+      const gd::String& icon24x24_);
+
  BehaviorMetadata(){};
  virtual ~BehaviorMetadata(){};

@@ -195,6 +210,13 @@ class GD_CORE_API BehaviorMetadata {
   */
  BehaviorMetadata& AddIncludeFile(const gd::String& includeFile);

+  /**
+   * \brief Add a file to the already existing required files.
+   * \note These files are required for the behavior to work,
+   * but they are not executable.
+   */
+  BehaviorMetadata& AddRequiredFile(const gd::String& requiredFile);
+
  /**
   * Get the help path of the behavior, relative to the GDevelop documentation
   * root.
@@ -239,16 +261,20 @@ class GD_CORE_API BehaviorMetadata {

  /**
   * \brief Return the associated gd::Behavior, handling behavior contents.
+   * 
+   * \note Returns a dumb Behavior for events based behaviors as CustomBehavior
+   * are using EventBasedBehavior.
   */
  gd::Behavior& Get() const;

  /**
   * \brief Return the associated gd::BehaviorsSharedData, handling behavior
   * shared data, if any (nullptr if none).
+   * 
+   * \note Returns nullptr for events based behaviors as they don't declare
+   * shared data yet.
   */
-  gd::BehaviorsSharedData* GetSharedDataInstance() const {
-    return sharedDatasInstance.get();
-  }
+  gd::BehaviorsSharedData* GetSharedDataInstance() const;

  /**
   * \brief Return a reference to a map containing the names of the actions
@@ -271,30 +297,29 @@ class GD_CORE_API BehaviorMetadata {
   */
  std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };

-#if defined(GD_IDE_ONLY)
  std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
  std::map<gd::String, gd::InstructionMetadata> actionsInfos;
  std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
  std::map<gd::String, gd::ExpressionMetadata> strExpressionsInfos;

  std::vector<gd::String> includeFiles;
+  std::vector<gd::String> requiredFiles;
  gd::String className;
-#endif
+
 private:
  gd::String extensionNamespace;
  gd::String helpPath;
-#if defined(GD_IDE_ONLY)
  gd::String fullname;
  gd::String defaultName;
  gd::String description;
  gd::String group;
  gd::String iconFilename;
  gd::String objectType;
-#endif

  // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
  std::shared_ptr<gd::Behavior> instance;
  std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance;
+  bool isEventBased;
 };

 }  // namespace gd
--- a/Core/GDCore/Extensions/Metadata/InstructionMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/InstructionMetadata.h
@@ -361,7 +361,7 @@ class GD_CORE_API InstructionMetadata {
     *                 _("the string"),
     *                 _("Text"),
     *                 "CppPlatform/Extensions/text24.png",
-     *                 "CppPlatform/Extensions/text.png");
+     *                 "CppPlatform/Extensions/text_black.png");
     *
     *      .AddParameter("object", _("Object"), "Text", false)
     *      .AddParameter("operator", _("Modification operator"), "string")
--- a/Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp
+++ b/Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp
@@ -14,6 +14,7 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Tools/Localization.h"
+#include "GDCore/Tools/Log.h"

 namespace gd {

@@ -22,45 +23,53 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                               const gd::String& fullname_,
                               const gd::String& description_,
                               const gd::String& icon24x24,
-                               std::shared_ptr<gd::Object> blueprintObject_)
-    : extensionNamespace(extensionNamespace_),
-      blueprintObject(blueprintObject_) {
-  name = name_;
-#if defined(GD_IDE_ONLY)
-  SetFullName(gd::String(fullname_));
-  SetDescription(gd::String(description_));
-  iconFilename = icon24x24;
-#endif
-  createFunPtr =
-      [blueprintObject_](gd::String name) -> std::unique_ptr<gd::Object> {
-    if (blueprintObject_ == std::shared_ptr<gd::Object>()) {
-      std::cout
-          << "Error: Unable to create object. Have you declared an extension "
-             "(or ObjectMetadata) without specifying an object as blueprint?"
-          << std::endl;
+                               std::shared_ptr<gd::ObjectConfiguration> blueprintObject_)
+    : ObjectMetadata(extensionNamespace_,
+                     name_,
+                     fullname_,
+                     description_,
+                     icon24x24,
+                     [blueprintObject_]() -> std::unique_ptr<gd::ObjectConfiguration> {
+    if (blueprintObject_ == std::shared_ptr<gd::ObjectConfiguration>()) {
+      gd::LogFatalError(
+          "Error: Unable to create object. Have you declared an extension "
+          "(or ObjectMetadata) without specifying an object as blueprint?");
      return nullptr;
    }
-
-    std::unique_ptr<gd::Object> newObject = blueprintObject_->Clone();
-    newObject->SetName(name);
-    return newObject;
-  };
+    return blueprintObject_->Clone();
+  }) {
+  blueprintObject = blueprintObject_;
 }

+ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
+                               const gd::String& name_,
+                               const gd::String& fullname_,
+                               const gd::String& description_,
+                               const gd::String& icon24x24)
+    : ObjectMetadata(extensionNamespace_,
+                     name_,
+                     fullname_,
+                     description_,
+                     icon24x24,
+                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
+      gd::LogFatalError(
+          "Error: Event-based objects don't have blueprint. "
+          "This method should not never be called.");
+      return nullptr;
+    }) {}
+
 ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                               const gd::String& name_,
                               const gd::String& fullname_,
                               const gd::String& description_,
                               const gd::String& icon24x24,
                               CreateFunPtr createFunPtrP)
-    : extensionNamespace(extensionNamespace_) {
-  name = name_;
-#if defined(GD_IDE_ONLY)
+    : name(name_),
+      iconFilename(icon24x24),
+      createFunPtr(createFunPtrP),
+      extensionNamespace(extensionNamespace_) {
  SetFullName(gd::String(fullname_));
  SetDescription(gd::String(description_));
-  iconFilename = icon24x24;
-#endif
-  createFunPtr = createFunPtrP;
 }

 gd::InstructionMetadata& ObjectMetadata::AddCondition(
--- a/Core/GDCore/Extensions/Metadata/ObjectMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/ObjectMetadata.h
@@ -13,6 +13,7 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/String.h"
 namespace gd {
 class InstructionMetadata;
@@ -20,7 +21,7 @@ class MultipleInstructionMetadata;
 class ExpressionMetadata;
 }  // namespace gd

-typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
    CreateFunPtr;

 namespace gd {
@@ -42,7 +43,17 @@ class GD_CORE_API ObjectMetadata {
                 const gd::String& fullname_,
                 const gd::String& description_,
                 const gd::String& icon24x24_,
-                 std::shared_ptr<gd::Object> blueprintObject_);
+                 std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
+  /**
+   * \brief Construct an object metadata, without "blueprint" object
+   * 
+   * \note This is used by events based objects.
+   */
+  ObjectMetadata(const gd::String& extensionNamespace_,
+                 const gd::String& name_,
+                 const gd::String& fullname_,
+                 const gd::String& description_,
+                 const gd::String& icon24x24_);

  /**
   * \brief Construct an object metadata, with a function that will be called
@@ -304,10 +315,12 @@ class GD_CORE_API ObjectMetadata {
  gd::String categoryFullName;
  std::set<gd::String> unsupportedBaseObjectCapabilities;

-  std::shared_ptr<gd::Object>
+  std::shared_ptr<gd::ObjectConfiguration>
      blueprintObject;  ///< The "blueprint" object to be copied when a new
                        ///< object is asked. Can be null in case a creation
-                        ///< function is passed.
+                        ///< function is passed or for events based objects
+                        ///< (CustomObject are using EventBasedObject, they
+                        ///< don't need blueprints).
 };

 }  // namespace gd
--- a/Core/GDCore/Extensions/Metadata/ParameterMetadata.h
+++ b/Core/GDCore/Extensions/Metadata/ParameterMetadata.h
@@ -199,7 +199,8 @@ class GD_CORE_API ParameterMetadata {
             parameterType == "objectAnimationName" ||
             parameterType == "functionParameterName" ||
             parameterType == "externalLayoutName" ||
-             parameterType == "leaderboardId";
+             parameterType == "leaderboardId" ||
+             parameterType == "identifier";
    } else if (type == "variable") {
      return parameterType == "objectvar" || parameterType == "globalvar" ||
             parameterType == "scenevar";
--- a/Core/GDCore/Extensions/Platform.cpp
+++ b/Core/GDCore/Extensions/Platform.cpp
@@ -7,7 +7,9 @@

 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/String.h"
+#include "GDCore/Tools/Log.h"

 using namespace std;

@@ -91,24 +93,22 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
  return std::shared_ptr<gd::PlatformExtension>();
 }

-std::unique_ptr<gd::Object> Platform::CreateObject(
-    gd::String type, const gd::String& name) const {
+std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
+    gd::String type) const {
  if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
-    std::cout << "Tried to create an object with an unknown type: " << type
-              << " for platform " << GetName() << "!" << std::endl;
+    gd::LogWarning("Tried to create an object with an unknown type: " + type
+              + " for platform " + GetName() + "!");
    type = "";
    if (creationFunctionTable.find("") == creationFunctionTable.end()) {
-      std::cout << "Unable to create a Base object!" << std::endl;
+      gd::LogError("Unable to create a Base object!");
      return nullptr;
    }
  }

  // Create a new object with the type we want.
-  std::unique_ptr<gd::Object> object =
-      (creationFunctionTable.find(type)->second)(name);
-  object->SetType(type);
-
-  return std::unique_ptr<gd::Object>(std::move(object));
+  auto objectConfiguration = (creationFunctionTable.find(type)->second)();
+  objectConfiguration->SetType(type);
+  return objectConfiguration;
 }

 #if defined(GD_IDE_ONLY)
--- a/Core/GDCore/Extensions/Platform.h
+++ b/Core/GDCore/Extensions/Platform.h
@@ -16,6 +16,7 @@ namespace gd {
 class InstructionsMetadataHolder;
 class Project;
 class Object;
+class ObjectConfiguration;
 class Behavior;
 class BehaviorMetadata;
 class ObjectMetadata;
@@ -26,7 +27,7 @@ class LayoutEditorCanvas;
 class ProjectExporter;
 }  // namespace gd

-typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
    CreateFunPtr;

 #undef CreateEvent
@@ -146,8 +147,8 @@ class GD_CORE_API Platform {
  /**
   * \brief Create an object of given type with the specified name.
   */
-  std::unique_ptr<gd::Object> CreateObject(gd::String type,
-                                           const gd::String& name) const;
+  std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
+      gd::String type) const;

  /**
   * \brief Create an event of given type
--- a/Core/GDCore/Extensions/PlatformExtension.cpp
+++ b/Core/GDCore/Extensions/PlatformExtension.cpp
@@ -18,6 +18,7 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Tools/Localization.h"

@@ -231,7 +232,7 @@ gd::ObjectMetadata& PlatformExtension::AddObject(
    const gd::String& fullname,
    const gd::String& description,
    const gd::String& icon24x24,
-    std::shared_ptr<gd::Object> instance) {
+    std::shared_ptr<gd::ObjectConfiguration> instance) {
  gd::String nameWithNamespace = GetNameSpace() + name;
  objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
                                                   nameWithNamespace,
@@ -244,6 +245,21 @@ gd::ObjectMetadata& PlatformExtension::AddObject(
  return objectsInfos[nameWithNamespace];
 }

+gd::ObjectMetadata& PlatformExtension::AddEventsBasedObject(
+    const gd::String& name,
+    const gd::String& fullname,
+    const gd::String& description,
+    const gd::String& icon24x24) {
+  gd::String nameWithNamespace = GetNameSpace() + name;
+  objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
+                                                   nameWithNamespace,
+                                                   fullname,
+                                                   description,
+                                                   icon24x24)
+                                        .SetHelpPath(GetHelpPath());
+  return objectsInfos[nameWithNamespace];
+}
+
 gd::BehaviorMetadata& PlatformExtension::AddBehavior(
    const gd::String& name,
    const gd::String& fullname,
@@ -269,6 +285,25 @@ gd::BehaviorMetadata& PlatformExtension::AddBehavior(
  return behaviorsInfo[nameWithNamespace];
 }

+gd::BehaviorMetadata& PlatformExtension::AddEventsBasedBehavior(
+    const gd::String& name,
+    const gd::String& fullname,
+    const gd::String& description,
+    const gd::String& group,
+    const gd::String& icon24x24) {
+  gd::String nameWithNamespace = GetNameSpace() + name;
+  behaviorsInfo[nameWithNamespace] = BehaviorMetadata(GetNameSpace(),
+                                                      nameWithNamespace,
+                                                      fullname,
+                                                      // Default name is the name
+                                                      name,
+                                                      description,
+                                                      group,
+                                                      icon24x24)
+                                         .SetHelpPath(GetHelpPath());
+  return behaviorsInfo[nameWithNamespace];
+}
+
 gd::EffectMetadata& PlatformExtension::AddEffect(const gd::String& name) {
  gd::String nameWithNamespace = GetNameSpace() + name;
  effectsMetadata[nameWithNamespace] = EffectMetadata(nameWithNamespace);
--- a/Core/GDCore/Extensions/PlatformExtension.h
+++ b/Core/GDCore/Extensions/PlatformExtension.h
@@ -37,9 +37,10 @@ class ArbitraryResourceWorker;
 class BehaviorsSharedData;
 class Behavior;
 class Object;
+class ObjectConfiguration;
 }  // namespace gd

-typedef std::function<std::unique_ptr<gd::Object>(gd::String name)>
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
    CreateFunPtr;

 namespace gd {
@@ -242,7 +243,21 @@ class GD_CORE_API PlatformExtension {
                                const gd::String& fullname_,
                                const gd::String& description_,
                                const gd::String& icon_,
-                                std::shared_ptr<gd::Object> instance);
+                                std::shared_ptr<gd::ObjectConfiguration> instance);
+
+  /**
+   * \brief Declare a new events based object as being part of the extension.
+   *
+   * \param name The name of the object
+   * \param fullname The user friendly name of the object
+   * \param description The user friendly description of the object
+   * \param icon The icon of the object.
+   */
+  gd::ObjectMetadata& AddEventsBasedObject(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& icon_);

  /**
   * \brief Declare a new behavior as being part of the extension.
@@ -267,6 +282,21 @@ class GD_CORE_API PlatformExtension {
      std::shared_ptr<gd::Behavior> instance,
      std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);

+  /**
+   * \brief Declare a new events based behavior as being part of the extension.
+   *
+   * \param name The name of the behavior
+   * \param fullname The user friendly name of the behavior
+   * \param description The user friendly description of the behavior
+   * \param icon The icon of the behavior.
+   */
+  gd::BehaviorMetadata& AddEventsBasedBehavior(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& group_,
+      const gd::String& icon_);
+
  /**
   * \brief Declare a new effect as being part of the extension.
   * \param name The internal name of the effect (also called effect type).
--- a/Core/GDCore/Extensions/PlatformExtension.inl
+++ b/Core/GDCore/Extensions/PlatformExtension.inl
@@ -25,8 +25,8 @@ gd::ObjectMetadata& PlatformExtension::AddObject(const gd::String& name,
                     fullname,
                     description,
                     icon24x24,
-                     [](gd::String name) -> std::unique_ptr<gd::Object> {
-                       return gd::make_unique<T>(name);
+                     []() -> std::unique_ptr<gd::ObjectConfiguration> {
+                       return gd::make_unique<T>();
                     })
          .SetHelpPath(GetHelpPath());

--- a/Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp
+++ b/Core/GDCore/IDE/Events/ArbitraryEventsWorker.cpp
@@ -73,4 +73,54 @@ bool ArbitraryEventsWorker::VisitInstruction(gd::Instruction& instruction,

 ArbitraryEventsWorkerWithContext::~ArbitraryEventsWorkerWithContext() {}

+
+ReadOnlyArbitraryEventsWorker::~ReadOnlyArbitraryEventsWorker() {}
+
+void ReadOnlyArbitraryEventsWorker::VisitEventList(const gd::EventsList& events) {
+  DoVisitEventList(events);
+
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    VisitEvent(events[i]);
+
+    if (events[i].CanHaveSubEvents()) {
+      VisitEventList(events[i].GetSubEvents());
+    }
+  }
+}
+
+void ReadOnlyArbitraryEventsWorker::VisitEvent(const gd::BaseEvent& event) {
+  DoVisitEvent(event);
+
+  const vector<const gd::InstructionsList*> conditionsVectors =
+      event.GetAllConditionsVectors();
+  for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+    VisitInstructionList(*conditionsVectors[j], true);
+  }
+
+  const vector<const gd::InstructionsList*> actionsVectors = event.GetAllActionsVectors();
+  for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+    VisitInstructionList(*actionsVectors[j], false);
+  }
+}
+
+void ReadOnlyArbitraryEventsWorker::VisitInstructionList(
+    const gd::InstructionsList& instructions, bool areConditions) {
+  DoVisitInstructionList(instructions, areConditions);
+
+  for (std::size_t i = 0; i < instructions.size(); ++i) {
+    VisitInstruction(instructions[i], areConditions);
+    if (!instructions[i].GetSubInstructions().empty()) {
+      VisitInstructionList(instructions[i].GetSubInstructions(),
+                            areConditions);
+    }
+  }
+}
+
+void ReadOnlyArbitraryEventsWorker::VisitInstruction(const gd::Instruction& instruction,
+                                             bool isCondition) {
+  DoVisitInstruction(instruction, isCondition);
+}
+
+ReadOnlyArbitraryEventsWorkerWithContext::~ReadOnlyArbitraryEventsWorkerWithContext() {}
+
 }  // namespace gd
--- a/Core/GDCore/IDE/Events/ArbitraryEventsWorker.h
+++ b/Core/GDCore/IDE/Events/ArbitraryEventsWorker.h
@@ -121,6 +121,101 @@ class GD_CORE_API ArbitraryEventsWorkerWithContext
  const gd::ObjectsContainer* currentObjectsContainer;
 };

+/**
+ * \brief ReadOnlyArbitraryEventsWorker is an abstract class used to browse events (and
+ * instructions). It can be used to implement autocompletion for example.
+ *
+ * \see gd::ReadOnlyArbitraryEventsWorkerWithContext
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ReadOnlyArbitraryEventsWorker {
+ public:
+  ReadOnlyArbitraryEventsWorker(){};
+  virtual ~ReadOnlyArbitraryEventsWorker();
+
+  /**
+   * \brief Launch the worker on the specified events list.
+   */
+  void Launch(const gd::EventsList& events) { VisitEventList(events); };
+
+ private:
+  void VisitEventList(const gd::EventsList& events);
+  void VisitEvent(const gd::BaseEvent& event);
+  void VisitInstructionList(const gd::InstructionsList& instructions,
+                            bool areConditions);
+  void VisitInstruction(const gd::Instruction& instruction, bool isCondition);
+
+  /**
+   * Called to do some work on an event list.
+   */
+  virtual void DoVisitEventList(const gd::EventsList& events){};
+
+  /**
+   * Called to do some work on an event
+   */
+  virtual void DoVisitEvent(const gd::BaseEvent& event) {};
+
+  /**
+   * Called to do some work on an instruction list
+   */
+  virtual void DoVisitInstructionList(const gd::InstructionsList& instructions,
+                                      bool areConditions){};
+
+  /**
+   * Called to do some work on an instruction.
+   */
+  virtual void DoVisitInstruction(const gd::Instruction& instruction,
+                                  bool isCondition) {};
+};
+
+/**
+ * \brief An events worker that will know about the context (the objects
+ * container). Useful for workers working on expressions notably.
+ *
+ * \see gd::ReadOnlyArbitraryEventsWorker
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ReadOnlyArbitraryEventsWorkerWithContext
+    : public ReadOnlyArbitraryEventsWorker {
+ public:
+  ReadOnlyArbitraryEventsWorkerWithContext()
+      : currentGlobalObjectsContainer(nullptr),
+        currentObjectsContainer(nullptr){};
+  virtual ~ReadOnlyArbitraryEventsWorkerWithContext();
+
+  /**
+   * \brief Launch the worker on the specified events list,
+   * giving the objects container on which the events are applying to.
+   */
+  void Launch(const gd::EventsList& events,
+              const gd::ObjectsContainer& globalObjectsContainer_,
+              const gd::ObjectsContainer& objectsContainer_) {
+    currentGlobalObjectsContainer = &globalObjectsContainer_;
+    currentObjectsContainer = &objectsContainer_;
+    ReadOnlyArbitraryEventsWorker::Launch(events);
+  };
+
+  void Launch(gd::EventsList& events) = delete;
+
+ protected:
+  const gd::ObjectsContainer& GetGlobalObjectsContainer() {
+    // Pointers are guaranteed to be not nullptr after
+    // Launch was called.
+    return *currentGlobalObjectsContainer;
+  };
+  const gd::ObjectsContainer& GetObjectsContainer() {
+    // Pointers are guaranteed to be not nullptr after
+    // Launch was called.
+    return *currentObjectsContainer;
+  };
+
+ private:
+  const gd::ObjectsContainer* currentGlobalObjectsContainer;
+  const gd::ObjectsContainer* currentObjectsContainer;
+};
+
 }  // namespace gd

 #endif  // GDCORE_ARBITRARYEVENTSWORKER_H
--- a/Core/GDCore/IDE/Events/BehaviorTypeRenamer.cpp
+++ b/Core/GDCore/IDE/Events/BehaviorTypeRenamer.cpp
@@ -0,0 +1,25 @@
+#include "BehaviorTypeRenamer.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/WholeProjectRefactorer.h"
+#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+void BehaviorTypeRenamer::DoVisitObject(gd::Object& object) {
+};
+
+void BehaviorTypeRenamer::DoVisitBehavior(gd::Behavior& behavior) {
+  if (behavior.GetTypeName() == oldType) {
+    behavior.SetTypeName(newType);
+  }
+};
+
+BehaviorTypeRenamer::~BehaviorTypeRenamer() {}
+
+}  // namespace gd
--- a/Core/GDCore/IDE/Events/BehaviorTypeRenamer.h
+++ b/Core/GDCore/IDE/Events/BehaviorTypeRenamer.h
@@ -0,0 +1,43 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_BEHAVIORTYPERENAMER_H
+#define GDCORE_BEHAVIORTYPERENAMER_H
+#include <set>
+
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Project;
+class Object;
+class Behavior;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API BehaviorTypeRenamer : public ArbitraryObjectsWorker {
+ public:
+  BehaviorTypeRenamer(const gd::Project& project_,
+                          const gd::String& oldType_,
+                          const gd::String& newType_)
+      : project(project_), oldType(oldType_), newType(newType_){};
+  virtual ~BehaviorTypeRenamer();
+
+ private:
+  void DoVisitObject(gd::Object& object) override;
+  void DoVisitBehavior(gd::Behavior& behavior) override;
+
+  const gd::Project& project;
+  gd::String oldType;
+  gd::String newType;
+};
+
+};  // namespace gd
+
+#endif // GDCORE_BEHAVIORTYPERENAMER_H
--- a/Core/GDCore/IDE/Events/CustomObjectTypeRenamer.cpp
+++ b/Core/GDCore/IDE/Events/CustomObjectTypeRenamer.cpp
@@ -0,0 +1,24 @@
+#include "CustomObjectTypeRenamer.h"
+
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/WholeProjectRefactorer.h"
+#include "GDCore/IDE/Events/ExpressionTypeFinder.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+
+namespace gd {
+
+void CustomObjectTypeRenamer::DoVisitObject(gd::Object& object) {
+  if (object.GetType() == oldType) {
+    object.SetType(newType);
+  }
+};
+
+void CustomObjectTypeRenamer::DoVisitBehavior(gd::Behavior& behavior) {};
+
+CustomObjectTypeRenamer::~CustomObjectTypeRenamer() {}
+
+}  // namespace gd
--- a/Core/GDCore/IDE/Events/CustomObjectTypeRenamer.h
+++ b/Core/GDCore/IDE/Events/CustomObjectTypeRenamer.h
@@ -0,0 +1,43 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_CUSTOMOBJECTTYPERENAMER_H
+#define GDCORE_CUSTOMOBJECTTYPERENAMER_H
+#include <set>
+
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class Project;
+class Object;
+class Behavior;
+}  // namespace gd
+
+namespace gd {
+
+class GD_CORE_API CustomObjectTypeRenamer : public ArbitraryObjectsWorker {
+ public:
+  CustomObjectTypeRenamer(const gd::Project& project_,
+                          const gd::String& oldType_,
+                          const gd::String& newType_)
+      : project(project_), oldType(oldType_), newType(newType_){};
+  virtual ~CustomObjectTypeRenamer();
+
+ private:
+  void DoVisitObject(gd::Object& object) override;
+  void DoVisitBehavior(gd::Behavior& behavior) override;
+
+  const gd::Project& project;
+  gd::String oldType;
+  gd::String newType;
+};
+
+};  // namespace gd
+
+#endif // GDCORE_CUSTOMOBJECTTYPERENAMER_H
--- a/Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp
+++ b/Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp
@@ -0,0 +1,254 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "EventsIdentifiersFinder.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/Instruction.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
+#include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/IDE/DependenciesAnalyzer.h"
+
+using namespace std;
+
+namespace gd {
+namespace {
+/**
+ * \brief Go through the nodes to search for identifier occurrences.
+ *
+ * \see gd::ExpressionParser2
+ */
+class GD_CORE_API IdentifierFinderExpressionNodeWorker
+    : public ExpressionParser2NodeWorker {
+ public:
+  IdentifierFinderExpressionNodeWorker(std::set<gd::String>& results_,
+                              const gd::Platform &platform_,
+                              const gd::ObjectsContainer &globalObjectsContainer_,
+                              const gd::ObjectsContainer &objectsContainer_,
+                              const gd::String& identifierType_,
+                              const gd::String& objectName_ = "")
+      : results(results_),
+        platform(platform_),
+        globalObjectsContainer(globalObjectsContainer_),
+        objectsContainer(objectsContainer_),
+        identifierType(identifierType_),
+        objectName(objectName_){};
+  virtual ~IdentifierFinderExpressionNodeWorker(){};
+
+ protected:
+  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
+    node.expression->Visit(*this);
+  }
+  void OnVisitOperatorNode(OperatorNode& node) override {
+    node.leftHandSide->Visit(*this);
+    node.rightHandSide->Visit(*this);
+  }
+  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
+    node.factor->Visit(*this);
+  }
+  void OnVisitNumberNode(NumberNode& node) override {}
+  void OnVisitTextNode(TextNode& node) override {}
+  void OnVisitVariableNode(VariableNode& node) override {
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitVariableBracketAccessorNode(
+      VariableBracketAccessorNode& node) override {
+    node.expression->Visit(*this);
+    if (node.child) node.child->Visit(*this);
+  }
+  void OnVisitIdentifierNode(IdentifierNode& node) override {}
+  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    bool considerFunction = objectName.empty() || node.objectName == objectName;
+
+    const bool isObjectFunction = !node.objectName.empty();
+    const gd::ExpressionMetadata &metadata = isObjectFunction ?
+            MetadataProvider::GetObjectAnyExpressionMetadata(
+                platform,
+                GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
+                node.functionName):
+          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);
+
+    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
+      return;
+    }
+    
+    size_t parameterIndex = 0;
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
+      && parameterIndex < node.parameters.size(); ++metadataIndex) {
+      auto& parameterMetadata = metadata.parameters[metadataIndex];
+      if (parameterMetadata.IsCodeOnly()) {
+        continue;
+      }
+      auto& parameterNode = node.parameters[parameterIndex];
+      ++parameterIndex;
+
+      if (considerFunction && parameterMetadata.GetType() == "identifier"
+       && parameterMetadata.GetExtraInfo() == identifierType) {
+        // Store the value of the parameter
+        results.insert(
+            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
+      } else {
+        parameterNode->Visit(*this);
+      }
+    }
+  }
+  void OnVisitEmptyNode(EmptyNode& node) override {}
+
+ private:
+  const gd::Platform &platform;
+  const gd::ObjectsContainer &globalObjectsContainer;
+  const gd::ObjectsContainer &objectsContainer;
+
+  std::set<gd::String>& results;  ///< Reference to the std::set where argument
+                                  ///< values must be stored.
+  gd::String identifierType;  ///< The type of the parameters to be searched for.
+  gd::String objectName;     ///< If not empty, parameters will be taken into
+                             ///< account only if related to this object.
+};
+
+/**
+ * \brief Go through the events to search for identifier occurrences.
+ */
+class GD_CORE_API IdentifierFinderEventWorker
+    : public ReadOnlyArbitraryEventsWorkerWithContext {
+ public:
+  IdentifierFinderEventWorker(std::set<gd::String>& results_,
+                              const gd::Platform &platform_,
+                              const gd::String& identifierType_,
+                              const gd::String& objectName_ = "")
+      : results(results_),
+        platform(platform_),
+        identifierType(identifierType_),
+        objectName(objectName_){};
+  virtual ~IdentifierFinderEventWorker(){};
+
+  void DoVisitInstructionList(const gd::InstructionsList& instructions,
+                                      bool areConditions) override {
+    for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
+      auto& instruction = instructions[aId];
+      gd::String lastObjectParameter = "";
+      const gd::InstructionMetadata& instrInfos =
+          areConditions ? MetadataProvider::GetConditionMetadata(
+                              platform, instruction.GetType())
+                        : MetadataProvider::GetActionMetadata(
+                              platform, instruction.GetType());
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+        // The parameter has the searched type...
+      if (instrInfos.parameters[pNb].type == "identifier"
+       && instrInfos.parameters[pNb].supplementaryInformation == identifierType) {
+          //...remember the value of the parameter.
+          if (objectName.empty() || lastObjectParameter == objectName) {
+            results.insert(instruction.GetParameter(pNb).GetPlainString());
+          }
+        }
+        // Search in expressions
+        else if (ParameterMetadata::IsExpression(
+                    "number", instrInfos.parameters[pNb].type) ||
+                ParameterMetadata::IsExpression(
+                    "string", instrInfos.parameters[pNb].type)) {
+          auto node = instruction.GetParameter(pNb).GetRootNode();
+
+          IdentifierFinderExpressionNodeWorker searcher(
+              results,
+              platform,
+              GetGlobalObjectsContainer(),
+              GetObjectsContainer(),
+              identifierType,
+              objectName);
+          node->Visit(searcher);
+        }
+        // Remember the value of the last "object" parameter.
+        else if (gd::ParameterMetadata::IsObject(
+                    instrInfos.parameters[pNb].type)) {
+          lastObjectParameter =
+              instruction.GetParameter(pNb).GetPlainString();
+        }
+      }
+    }
+  };
+
+ private:
+  const gd::Platform &platform;
+
+  std::set<gd::String>& results;  ///< Reference to the std::set where argument
+                                  ///< values must be stored.
+  gd::String identifierType;  ///< The type of the parameters to be searched for.
+  gd::String objectName;     ///< If not empty, parameters will be taken into
+                             ///< account only if related to this object.
+};
+} // namespace
+
+std::set<gd::String> EventsIdentifiersFinder::FindAllIdentifierExpressions(
+    const gd::Platform& platform,
+    const gd::Project& project,
+    const gd::Layout& layout,
+    const gd::String& identifierType,
+    const gd::String& contextObjectName) {
+  std::set<gd::String> results;
+
+  const bool isObjectIdentifier = identifierType.find("object") == 0;
+  // The object from the context is only relevent for object identifiers.
+  auto& actualObjectName = isObjectIdentifier ? contextObjectName : "";
+
+  FindArgumentsInEventsAndDependencies(
+      results,
+      platform,
+      project,
+      layout,
+      identifierType,
+      actualObjectName);
+
+  return results;
+}
+
+void EventsIdentifiersFinder::FindArgumentsInEventsAndDependencies(
+    std::set<gd::String>& results,
+    const gd::Platform& platform,
+    const gd::Project& project,
+    const gd::Layout& layout,
+    const gd::String& identifierType,
+    const gd::String& objectName) {
+  IdentifierFinderEventWorker eventWorker(results,
+                                        platform,
+                                        identifierType,
+                                        objectName);
+  eventWorker.Launch(layout.GetEvents(), project, layout);
+
+  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
+  dependenciesAnalyzer.Analyze();
+  for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
+    const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);
+
+    IdentifierFinderEventWorker eventWorker(results,
+                                          platform,
+                                          identifierType,
+                                          objectName);
+    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
+  }
+  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
+    const gd::Layout& dependencyLayout = project.GetLayout(sceneName);
+
+    IdentifierFinderEventWorker eventWorker(results,
+                                          platform,
+                                          identifierType,
+                                          objectName);
+    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
+  }
+}
+
+}  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsIdentifiersFinder.h
+++ b/Core/GDCore/IDE/Events/EventsIdentifiersFinder.h
@@ -0,0 +1,81 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EVENTSIDENTIFIERSFINDER_H
+#define EVENTSIDENTIFIERSFINDER_H
+#include <set>
+#include <vector>
+#include "GDCore/Events/Event.h"
+#include "GDCore/String.h"
+namespace gd {
+class Instruction;
+class Platform;
+class Object;
+class Project;
+class Layout;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Perform a search over a layout, searching for layout or object custom
+ * identifiers.
+ *
+ * \todo Refactor this class using ArbitraryEventsWorker
+ *
+ * \ingroup IDE
+ */
+class EventsIdentifiersFinder {
+ public:
+  EventsIdentifiersFinder(){};
+  virtual ~EventsIdentifiersFinder(){};
+
+  /**
+   * Construct a list containing all the expressions for a given identifier used
+   * in the layout.
+   *
+   * \param project The project to use.
+   * \param layout The layout to use.
+   * \param  identifierType The identifier type to be analyzed.
+   * \param  objectName If not empty, parameters will be taken into account
+   * only if the last object parameter is filled with
+   * this value.
+   * \return A std::set containing the names of all identifiers used.
+   */
+  static std::set<gd::String> FindAllIdentifierExpressions(
+      const gd::Platform& platform,
+      const gd::Project& project,
+      const gd::Layout& layout,
+      const gd::String& identifierType,
+      const gd::String& objectName = "");
+
+ private:
+  /**
+   * Construct a list containing all the expressions for a given identifier used
+   * in the layout. It searches in events dependencies.
+   *
+   * \param results A std::set to fill with the expressions used for all parameters of the
+   * specified identifier type
+   * \param platform The platform of the project
+   * \param project The project to use.
+   * \param layout The layout to use.
+   * \param events The events to be analyzed
+   * \param identifierType The identifier type to be analyzed
+   * \param objectName If not empty, parameters will be taken into account
+   * only if the last object parameter is filled with
+   * this value.
+   */
+  static void FindArgumentsInEventsAndDependencies(
+      std::set<gd::String>& results,
+      const gd::Platform& platform,
+      const gd::Project& project,
+      const gd::Layout& layout,
+      const gd::String& identifierType,
+      const gd::String& objectName = "");
+};
+
+}  // namespace gd
+
+#endif  // EVENTSIDENTIFIERSFINDER_H
--- a/Core/GDCore/IDE/Events/EventsRefactorer.cpp
+++ b/Core/GDCore/IDE/Events/EventsRefactorer.cpp
@@ -19,6 +19,7 @@
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/IDE/Events/InstructionSentenceFormatter.h"
 #include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"

 using namespace std;
@@ -121,7 +122,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
  bool hasDoneRenaming;
  const gd::String& objectName;
  const gd::String& objectNewName;
-  
+
  const gd::Platform &platform;
  const gd::ObjectsContainer &globalObjectsContainer;
  const gd::ObjectsContainer &objectsContainer;
@@ -216,7 +217,7 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
 private:
  bool hasObject;
  const gd::String& objectName;
-  
+
  const gd::Platform &platform;
  const gd::ObjectsContainer &globalObjectsContainer;
  const gd::ObjectsContainer &objectsContainer;
@@ -411,8 +412,8 @@ void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
 }

 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             gd::ObjectsContainer& project,
-                                             gd::ObjectsContainer& layout,
+                                             gd::ObjectsContainer& globalObjectsContainer,
+                                             gd::ObjectsContainer& objectsContainer,
                                             gd::InstructionsList& actions,
                                             gd::String name) {
  bool somethingModified = false;
@@ -434,7 +435,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
                   "number", instrInfos.parameters[pNb].type)) {
        auto node = actions[aId].GetParameter(pNb).GetRootNode();

-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
          deleteMe = true;
          break;
        }
@@ -444,7 +445,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
                   "string", instrInfos.parameters[pNb].type)) {
        auto node = actions[aId].GetParameter(pNb).GetRootNode();

-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
          deleteMe = true;
          break;
        }
@@ -458,8 +459,8 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
    } else if (!actions[aId].GetSubInstructions().empty())
      somethingModified =
          RemoveObjectInActions(platform,
-                                project,
-                                layout,
+                                globalObjectsContainer,
+                                objectsContainer,
                                actions[aId].GetSubInstructions(),
                                name) ||
          somethingModified;
@@ -470,8 +471,8 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,

 bool EventsRefactorer::RemoveObjectInConditions(
    const gd::Platform& platform,
-    gd::ObjectsContainer& project,
-    gd::ObjectsContainer& layout,
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::ObjectsContainer& objectsContainer,
    gd::InstructionsList& conditions,
    gd::String name) {
  bool somethingModified = false;
@@ -494,7 +495,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
                   "number", instrInfos.parameters[pNb].type)) {
        auto node = conditions[cId].GetParameter(pNb).GetRootNode();

-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "number", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "number", *node, name)) {
          deleteMe = true;
          break;
        }
@@ -504,7 +505,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
                   "string", instrInfos.parameters[pNb].type)) {
        auto node = conditions[cId].GetParameter(pNb).GetRootNode();

-        if (ExpressionObjectFinder::CheckIfHasObject(platform, project, layout, "string", *node, name)) {
+        if (ExpressionObjectFinder::CheckIfHasObject(platform, globalObjectsContainer, objectsContainer, "string", *node, name)) {
          deleteMe = true;
          break;
        }
@@ -518,8 +519,8 @@ bool EventsRefactorer::RemoveObjectInConditions(
    } else if (!conditions[cId].GetSubInstructions().empty())
      somethingModified =
          RemoveObjectInConditions(platform,
-                                   project,
-                                   layout,
+                                   globalObjectsContainer,
+                                   objectsContainer,
                                   conditions[cId].GetSubInstructions(),
                                   name) ||
          somethingModified;
@@ -529,8 +530,8 @@ bool EventsRefactorer::RemoveObjectInConditions(
 }

 void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
-                                            gd::ObjectsContainer& project,
-                                            gd::ObjectsContainer& layout,
+                                            gd::ObjectsContainer& globalObjectsContainer,
+                                            gd::ObjectsContainer& objectsContainer,
                                            gd::EventsList& events,
                                            gd::String name) {
  for (std::size_t i = 0; i < events.size(); ++i) {
@@ -538,19 +539,19 @@ void EventsRefactorer::RemoveObjectInEvents(const gd::Platform& platform,
        events[i].GetAllConditionsVectors();
    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
      bool conditionsModified = RemoveObjectInConditions(
-          platform, project, layout, *conditionsVectors[j], name);
+          platform, globalObjectsContainer, objectsContainer, *conditionsVectors[j], name);
    }

    vector<gd::InstructionsList*> actionsVectors =
        events[i].GetAllActionsVectors();
    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
      bool actionsModified = RemoveObjectInActions(
-          platform, project, layout, *actionsVectors[j], name);
+          platform, globalObjectsContainer, objectsContainer, *actionsVectors[j], name);
    }

    if (events[i].CanHaveSubEvents())
      RemoveObjectInEvents(
-          platform, project, layout, events[i].GetSubEvents(), name);
+          platform, globalObjectsContainer, objectsContainer, events[i].GetSubEvents(), name);
  }
 }

@@ -565,6 +566,8 @@ std::vector<EventsSearchResult> EventsRefactorer::ReplaceStringInEvents(
    bool inActions,
    bool inEventStrings) {
  vector<EventsSearchResult> modifiedEvents;
+  if (toReplace.empty()) return modifiedEvents;
+
  for (std::size_t i = 0; i < events.size(); ++i) {
    bool eventModified = false;
    if (inConditions) {
--- a/Core/GDCore/IDE/Events/EventsVariablesFinder.cpp
+++ b/Core/GDCore/IDE/Events/EventsVariablesFinder.cpp
@@ -13,6 +13,7 @@
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
@@ -22,28 +23,28 @@
 using namespace std;

 namespace gd {
-
+namespace {
 /**
- * \brief Go through the nodes and change the given object name to a new one.
+ * \brief Go through the nodes to search for variable occurrences.
 *
 * \see gd::ExpressionParser2
 */
-class GD_CORE_API ExpressionParameterSearcher
+class GD_CORE_API VariableFinderExpressionNodeWorker
    : public ExpressionParser2NodeWorker {
 public:
-  ExpressionParameterSearcher(const gd::Platform &platform_,
+  VariableFinderExpressionNodeWorker(std::set<gd::String>& results_,
+                              const gd::Platform &platform_,
                              const gd::ObjectsContainer &globalObjectsContainer_,
                              const gd::ObjectsContainer &objectsContainer_,
-                              std::set<gd::String>& results_,
                              const gd::String& parameterType_,
                              const gd::String& objectName_ = "")
-      : platform(platform_),
+      : results(results_),
+        platform(platform_),
        globalObjectsContainer(globalObjectsContainer_),
        objectsContainer(objectsContainer_),
-        results(results_),
        parameterType(parameterType_),
        objectName(objectName_){};
-  virtual ~ExpressionParameterSearcher(){};
+  virtual ~VariableFinderExpressionNodeWorker(){};

 protected:
  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
@@ -74,27 +75,34 @@ class GD_CORE_API ExpressionParameterSearcher
  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
    bool considerFunction = objectName.empty() || node.objectName == objectName;

-    const gd::ExpressionMetadata &metadata = node.objectName.empty() ?
-          MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName) :
+    const bool isObjectFunction = !node.objectName.empty();
+    const gd::ExpressionMetadata &metadata = isObjectFunction ?
            MetadataProvider::GetObjectAnyExpressionMetadata(
                platform,
                GetTypeOfObject(globalObjectsContainer, objectsContainer, objectName),
-                node.functionName);
+                node.functionName):
+            MetadataProvider::GetAnyExpressionMetadata(platform, node.functionName);

    if (gd::MetadataProvider::IsBadExpressionMetadata(metadata)) {
      return;
    }
-    
-    for (size_t i = 0; i < node.parameters.size() &&
-                       i < metadata.parameters.size();
-         ++i) {
-      auto& parameterMetadata = metadata.parameters[i];
+
+    size_t parameterIndex = 0;
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
+      && parameterIndex < node.parameters.size(); ++metadataIndex) {
+      auto& parameterMetadata = metadata.parameters[metadataIndex];
+      if (parameterMetadata.IsCodeOnly()) {
+        continue;
+      }
+      auto& parameterNode = node.parameters[parameterIndex];
+      ++parameterIndex;
+
      if (considerFunction && parameterMetadata.GetType() == parameterType) {
        // Store the value of the parameter
        results.insert(
-            gd::ExpressionParser2NodePrinter::PrintNode(*node.parameters[i]));
+            gd::ExpressionParser2NodePrinter::PrintNode(*parameterNode));
      } else {
-        node.parameters[i]->Visit(*this);
+        parameterNode->Visit(*this);
      }
    }
  }
@@ -112,18 +120,87 @@ class GD_CORE_API ExpressionParameterSearcher
                             ///< account only if related to this object.
 };

+/**
+ * \brief Go through the events to search for variable occurrences.
+ */
+class GD_CORE_API VariableFinderEventWorker
+    : public ReadOnlyArbitraryEventsWorkerWithContext {
+ public:
+  VariableFinderEventWorker(std::set<gd::String>& results_,
+                              const gd::Platform &platform_,
+                              const gd::String& parameterType_,
+                              const gd::String& objectName_ = "")
+      : results(results_),
+        platform(platform_),
+        parameterType(parameterType_),
+        objectName(objectName_){};
+  virtual ~VariableFinderEventWorker(){};
+
+  void DoVisitInstructionList(const gd::InstructionsList& instructions,
+                                      bool areConditions) override {
+    for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
+      auto& instruction = instructions[aId];
+      gd::String lastObjectParameter = "";
+      const gd::InstructionMetadata& instrInfos =
+          areConditions ? MetadataProvider::GetConditionMetadata(
+                              platform, instruction.GetType())
+                        : MetadataProvider::GetActionMetadata(
+                              platform, instruction.GetType());
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+        // The parameter has the searched type...
+        if (instrInfos.parameters[pNb].type == parameterType) {
+          //...remember the value of the parameter.
+          if (objectName.empty() || lastObjectParameter == objectName)
+            results.insert(instruction.GetParameter(pNb).GetPlainString());
+        }
+        // Search in expressions
+        else if (ParameterMetadata::IsExpression(
+                    "number", instrInfos.parameters[pNb].type) ||
+                ParameterMetadata::IsExpression(
+                    "string", instrInfos.parameters[pNb].type)) {
+          auto node = instruction.GetParameter(pNb).GetRootNode();
+
+          VariableFinderExpressionNodeWorker searcher(
+              results,
+              platform,
+              GetGlobalObjectsContainer(),
+              GetObjectsContainer(),
+              parameterType,
+              objectName);
+          node->Visit(searcher);
+        }
+        // Remember the value of the last "object" parameter.
+        else if (gd::ParameterMetadata::IsObject(
+                    instrInfos.parameters[pNb].type)) {
+          lastObjectParameter =
+              instruction.GetParameter(pNb).GetPlainString();
+        }
+      }
+    }
+  };
+
+ private:
+  const gd::Platform &platform;
+
+  std::set<gd::String>& results;  ///< Reference to the std::set where argument
+                                  ///< values must be stored.
+  gd::String parameterType;  ///< The type of the parameters to be searched for.
+  gd::String objectName;     ///< If not empty, parameters will be taken into
+                             ///< account only if related to this object.
+};
+} // namespace
+
 std::set<gd::String> EventsVariablesFinder::FindAllGlobalVariables(
    const gd::Platform& platform, const gd::Project& project) {
  std::set<gd::String> results;

  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
-    std::set<gd::String> results2 =
-        FindArgumentsInEventsAndDependencies(
+    FindArgumentsInEventsAndDependencies(
+            results,
            platform,
            project,
            project.GetLayout(i),
            "globalvar");
-    results.insert(results2.begin(), results2.end());
  }

  return results;
@@ -135,9 +212,12 @@ std::set<gd::String> EventsVariablesFinder::FindAllLayoutVariables(
    const gd::Layout& layout) {
  std::set<gd::String> results;

-  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
-      platform, project, layout, "scenevar");
-  results.insert(results2.begin(), results2.end());
+  FindArgumentsInEventsAndDependencies(
+      results,
+      platform,
+      project,
+      layout,
+      "scenevar");

  return results;
 }
@@ -149,159 +229,51 @@ std::set<gd::String> EventsVariablesFinder::FindAllObjectVariables(
    const gd::Object& object) {
  std::set<gd::String> results;

-  std::set<gd::String> results2 = FindArgumentsInEventsAndDependencies(
+  FindArgumentsInEventsAndDependencies(
+      results,
      platform,
      project,
      layout,
      "objectvar",
      object.GetName());
-  results.insert(results2.begin(), results2.end());

  return results;
 }

-std::set<gd::String> EventsVariablesFinder::FindArgumentsInInstructions(
-    const gd::Platform& platform,
-    const gd::Project& project,
-    const gd::Layout& layout,
-    const gd::InstructionsList& instructions,
-    bool instructionsAreConditions,
-    const gd::String& parameterType,
-    const gd::String& objectName) {
-  std::set<gd::String> results;
-
-  for (std::size_t aId = 0; aId < instructions.size(); ++aId) {
-    gd::String lastObjectParameter = "";
-    const gd::InstructionMetadata& instrInfos =
-        instructionsAreConditions ? MetadataProvider::GetConditionMetadata(
-                                        platform, instructions[aId].GetType())
-                                  : MetadataProvider::GetActionMetadata(
-                                        platform, instructions[aId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
-      // The parameter has the searched type...
-      if (instrInfos.parameters[pNb].type == parameterType) {
-        //...remember the value of the parameter.
-        if (objectName.empty() || lastObjectParameter == objectName)
-          results.insert(instructions[aId].GetParameter(pNb).GetPlainString());
-      }
-      // Search in expressions
-      else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters[pNb].type) ||
-               ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters[pNb].type)) {
-        auto node = instructions[aId].GetParameter(pNb).GetRootNode();
-
-        ExpressionParameterSearcher searcher(
-            platform,
-            project,
-            layout,
-            results,
-            parameterType,
-            objectName);
-        node->Visit(searcher);
-      }
-      // Remember the value of the last "object" parameter.
-      else if (gd::ParameterMetadata::IsObject(
-                   instrInfos.parameters[pNb].type)) {
-        lastObjectParameter =
-            instructions[aId].GetParameter(pNb).GetPlainString();
-      }
-    }
-
-    if (!instructions[aId].GetSubInstructions().empty())
-      FindArgumentsInInstructions(platform,
-                                  project,
-                                  layout,
-                                  instructions[aId].GetSubInstructions(),
-                                  instructionsAreConditions,
-                                  parameterType);
-  }
-
-  return results;
-}
-
-std::set<gd::String> EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
+void EventsVariablesFinder::FindArgumentsInEventsAndDependencies(
+    std::set<gd::String>& results,
    const gd::Platform& platform,
    const gd::Project& project,
    const gd::Layout& layout,
    const gd::String& parameterType,
    const gd::String& objectName) {
-  std::set<gd::String> results;

-  std::set<gd::String> results2 = FindArgumentsInEvents(
-      platform, project, layout, layout.GetEvents(), parameterType, objectName);
-  results.insert(results2.begin(), results2.end());
+  VariableFinderEventWorker eventWorker(results,
+                                        platform,
+                                        parameterType,
+                                        objectName);
+  eventWorker.Launch(layout.GetEvents(), project, layout);

  DependenciesAnalyzer dependenciesAnalyzer = DependenciesAnalyzer(project, layout);
  dependenciesAnalyzer.Analyze();
  for (const gd::String& externalEventName : dependenciesAnalyzer.GetExternalEventsDependencies()) {
    const gd::ExternalEvents& externalEvents = project.GetExternalEvents(externalEventName);

-    std::set<gd::String> results3 = FindArgumentsInEvents(
-        platform, project, layout, externalEvents.GetEvents(), parameterType, objectName);
-    results.insert(results3.begin(), results3.end());
+    VariableFinderEventWorker eventWorker(results,
+                                          platform,
+                                          parameterType,
+                                          objectName);
+    eventWorker.Launch(externalEvents.GetEvents(), project, layout);
  }
  for (const gd::String& sceneName : dependenciesAnalyzer.GetScenesDependencies()) {
    const gd::Layout& dependencyLayout = project.GetLayout(sceneName);

-    std::set<gd::String> results3 = FindArgumentsInEvents(
-        platform, project, dependencyLayout, dependencyLayout.GetEvents(), parameterType, objectName);
-    results.insert(results3.begin(), results3.end());
+    VariableFinderEventWorker eventWorker(results,
+                                          platform,
+                                          parameterType,
+                                          objectName);
+    eventWorker.Launch(dependencyLayout.GetEvents(), project, dependencyLayout);
  }
-
-  return results;
-}
-
-std::set<gd::String> EventsVariablesFinder::FindArgumentsInEvents(
-    const gd::Platform& platform,
-    const gd::Project& project,
-    const gd::Layout& layout,
-    const gd::EventsList& events,
-    const gd::String& parameterType,
-    const gd::String& objectName) {
-  std::set<gd::String> results;
-  for (std::size_t i = 0; i < events.size(); ++i) {
-    vector<const gd::InstructionsList*> conditionsVectors =
-        events[i].GetAllConditionsVectors();
-    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
-      std::set<gd::String> results2 =
-          FindArgumentsInInstructions(platform,
-                                      project,
-                                      layout,
-                                      *conditionsVectors[j],
-                                      /*conditions=*/true,
-                                      parameterType,
-                                      objectName);
-      results.insert(results2.begin(), results2.end());
-    }
-
-    vector<const gd::InstructionsList*> actionsVectors =
-        events[i].GetAllActionsVectors();
-    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
-      std::set<gd::String> results2 =
-          FindArgumentsInInstructions(platform,
-                                      project,
-                                      layout,
-                                      *actionsVectors[j],
-                                      /*conditions=*/false,
-                                      parameterType,
-                                      objectName);
-      results.insert(results2.begin(), results2.end());
-    }
-
-    if (events[i].CanHaveSubEvents()) {
-      std::set<gd::String> results2 =
-          FindArgumentsInEvents(platform,
-                                project,
-                                layout,
-                                events[i].GetSubEvents(),
-                                parameterType,
-                                objectName);
-      results.insert(results2.begin(), results2.end());
-    }
-  }
-
-  return results;
 }

 }  // namespace gd
--- a/Core/GDCore/IDE/Events/EventsVariablesFinder.h
+++ b/Core/GDCore/IDE/Events/EventsVariablesFinder.h
@@ -23,7 +23,6 @@ namespace gd {
 * \brief Perform a search over a project or a layout, searching for layout,
 * global or object variables.
 *
- * \todo Refactor this class using ArbitraryEventsWorker
 * \todo Rework this class to return the shapes (maybe even types?) of the
 * variables (in particular for structures and arrays), so we can use this
 * for better autocompletions in the variables dialogs in the IDE.
@@ -74,34 +73,13 @@ class EventsVariablesFinder {
      const gd::Object& object);

 private:
-  /**
-   * Construct a list of the value of the arguments for parameters of type @
-   * parameterType
-   *
-   * \param project The project used
-   * \param project The layout used
-   * \param instructions The instructions to be analyzed
-   * \param instructionsAreConditions True if the instructions are conditions.
-   * \param parameterType The parameters type to be analyzed
-   * \param objectName If not empty, parameters will be taken into account only
-   * if the last object parameter is filled with this value.
-   *
-   * \return A std::set filled with the values used for all parameters of the
-   * specified type
-   */
-  static std::set<gd::String> FindArgumentsInInstructions(
-      const gd::Platform& platform,
-      const gd::Project& project,
-      const gd::Layout& layout,
-      const gd::InstructionsList& instructions,
-      bool instructionsAreConditions,
-      const gd::String& parameterType,
-      const gd::String& objectName = "");

  /**
   * Construct a list of the value of the arguments for parameters of type @
-   * parameterType. It searchs in events dependencies.
+   * parameterType. It searches in events dependencies.
   *
+   * \param results A std::set to fill with the values used for all parameters of the
+   * specified type
   * \param platform The platform of the project
   * \param project The project used
   * \param layout The layout used
@@ -110,40 +88,14 @@ class EventsVariablesFinder {
   * \param objectName If not empty, parameters will be taken into account
   * only if the last object parameter is filled with
   * this value.
-   *
-   * \return A std::set filled with the values used for all parameters of the
-   * specified type
   */
-  static std::set<gd::String> FindArgumentsInEventsAndDependencies(
+  static void FindArgumentsInEventsAndDependencies(
+      std::set<gd::String>& results,
      const gd::Platform& platform,
      const gd::Project& project,
      const gd::Layout& layout,
      const gd::String& parameterType,
      const gd::String& objectName = "");
-
-  /**
-   * Construct a list of the value of the arguments for parameters of type @
-   * parameterType. It doesn't search in events dependencies.
-   *
-   * \param platform The platform of the project
-   * \param project The project used
-   * \param layout The layout used
-   * \param events The events to be analyzed
-   * \param parameterType The parameters type to be analyzed
-   * \param objectName If not empty, parameters will be taken into account
-   * only if the last object parameter is filled with
-   * this value.
-   *
-   * \return A std::set filled with the values used for all parameters of the
-   * specified type
-   */
-  static std::set<gd::String> FindArgumentsInEvents(
-      const gd::Platform& platform,
-      const gd::Project& project,
-      const gd::Layout& layout,
-      const gd::EventsList& events,
-      const gd::String& parameterType,
-      const gd::String& objectName);
 };

 }  // namespace gd
--- a/Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp
+++ b/Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp
@@ -78,13 +78,16 @@ class GD_CORE_API ExpressionParameterMover
  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
    auto moveParameter =
-        [this](std::vector<std::unique_ptr<gd::ExpressionNode>>& parameters) {
-          if (oldIndex >= parameters.size() || newIndex >= parameters.size())
+        [this](std::vector<std::unique_ptr<gd::ExpressionNode>>& parameters, int firstWrittenParameterIndex) {
+          size_t newExpressionIndex = newIndex - firstWrittenParameterIndex;
+          size_t oldExpressionIndex = oldIndex - firstWrittenParameterIndex;
+
+          if (oldExpressionIndex >= parameters.size() || newExpressionIndex >= parameters.size())
            return;

-          auto movedParameterNode = std::move(parameters[oldIndex]);
-          parameters.erase(parameters.begin() + oldIndex);
-          parameters.insert(parameters.begin() + newIndex,
+          auto movedParameterNode = std::move(parameters[oldExpressionIndex]);
+          parameters.erase(parameters.begin() + oldExpressionIndex);
+          parameters.insert(parameters.begin() + newExpressionIndex,
                            std::move(movedParameterNode));
        };

@@ -92,10 +95,13 @@ class GD_CORE_API ExpressionParameterMover
      if (behaviorType.empty() && !objectType.empty() &&
          !node.objectName.empty()) {
        // Move parameter of an object function
+        // This refactor only applies on events object functions
+        // and events object functions doesn't exist yet.
+        // This is a dead code.
        const gd::String& thisObjectType = gd::GetTypeOfObject(
            globalObjectsContainer, objectsContainer, node.objectName);
        if (thisObjectType == objectType) {
-          moveParameter(node.parameters);
+          moveParameter(node.parameters, 1);
          hasDoneMoving = true;
        }
      } else if (!behaviorType.empty() && !node.behaviorName.empty()) {
@@ -103,12 +109,12 @@ class GD_CORE_API ExpressionParameterMover
        const gd::String& thisBehaviorType = gd::GetTypeOfBehavior(
            globalObjectsContainer, objectsContainer, node.behaviorName);
        if (thisBehaviorType == behaviorType) {
-          moveParameter(node.parameters);
+          moveParameter(node.parameters, 2);
          hasDoneMoving = true;
        }
      } else if (behaviorType.empty() && objectType.empty()) {
        // Move parameter of a free function
-        moveParameter(node.parameters);
+        moveParameter(node.parameters, 1);
        hasDoneMoving = true;
      }
    }
--- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp
+++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp
@@ -5,7 +5,7 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"

@@ -29,7 +29,7 @@ void UsedExtensionsFinder::DoVisitObject(gd::Object& object) {

 // Behaviors scanner

-void UsedExtensionsFinder::DoVisitBehavior(gd::BehaviorContent& behavior) {
+void UsedExtensionsFinder::DoVisitBehavior(gd::Behavior& behavior) {
  usedExtensions.insert(
      gd::MetadataProvider::GetExtensionAndBehaviorMetadata(
          project.GetCurrentPlatform(), behavior.GetTypeName())
--- a/Core/GDCore/IDE/Events/UsedExtensionsFinder.h
+++ b/Core/GDCore/IDE/Events/UsedExtensionsFinder.h
@@ -16,7 +16,7 @@
 namespace gd {
 class Project;
 class Object;
-class BehaviorContent;
+class Behavior;
 }  // namespace gd

 namespace gd {
@@ -38,7 +38,7 @@ class GD_CORE_API UsedExtensionsFinder
  void DoVisitObject(gd::Object& object) override;

  // Behavior Visitor
-  void DoVisitBehavior(gd::BehaviorContent& behavior) override;
+  void DoVisitBehavior(gd::Behavior& behavior) override;

  // Instructions Visitor
  bool DoVisitInstruction(gd::Instruction& instruction,
--- a/Core/GDCore/IDE/EventsFunctionTools.cpp
+++ b/Core/GDCore/IDE/EventsFunctionTools.cpp
@@ -8,9 +8,10 @@
 #include "GDCore/Events/Expression.h"
 #include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
+//#include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/Log.h"
@@ -72,4 +73,39 @@ void EventsFunctionTools::BehaviorEventsFunctionToObjectsContainer(
  }
 }

+void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
+    const gd::Project& project,
+    const gd::EventsBasedObject& eventsBasedObject,
+    const gd::EventsFunction& eventsFunction,
+    gd::ObjectsContainer& outputGlobalObjectsContainer,
+    gd::ObjectsContainer& outputObjectsContainer) {
+  // The context is build the same way as free function...
+  FreeEventsFunctionToObjectsContainer(project,
+                                       eventsFunction,
+                                       outputGlobalObjectsContainer,
+                                       outputObjectsContainer);
+
+  // TODO EBO Use a constant instead a hard coded value "Object".
+  // ...and has an "Object" by convention...
+  if (!outputObjectsContainer.HasObjectNamed("Object")) {
+    gd::LogWarning("No \"Object\" in a function of an events based object: " +
+                   eventsFunction.GetName() +
+                   ". This means this function is likely misconfigured (check "
+                   "its parameters).");
+    return;
+  }
+  if (eventsBasedObject.HasObjectNamed("Object")) {
+    gd::LogWarning("Child-objects can't be named Object because it's reserved"
+                  "for the parent. ");
+    return;
+  }
+
+  // ...and its children.
+  auto &children = eventsBasedObject.GetObjects();
+  for (auto &childObject : children) {
+    auto child = childObject.get();
+    outputObjectsContainer.InsertObject(*child, children.size());
+  }
+}
+
 }  // namespace gd
--- a/Core/GDCore/IDE/EventsFunctionTools.h
+++ b/Core/GDCore/IDE/EventsFunctionTools.h
@@ -14,6 +14,7 @@ class ObjectsContainer;
 class ParameterMetadata;
 class EventsFunction;
 class EventsBasedBehavior;
+class EventsBasedObject;
 class Expression;
 }  // namespace gd

@@ -51,6 +52,21 @@ class GD_CORE_API EventsFunctionTools {
      const gd::EventsFunction& eventsFunction,
      gd::ObjectsContainer& outputGlobalObjectsContainer,
      gd::ObjectsContainer& outputObjectsContainer);
+  /**
+   * \brief Given a parent-object events function, initialize the given objects container
+   * with objects described in the events function parameters, in
+   * the events function groups and in the parent-object properties for
+   * child-objects.
+   *
+   * This is useful to create the "context" of a function, before code
+   * generation for example.
+   */
+  static void ObjectEventsFunctionToObjectsContainer(
+      const gd::Project& project,
+      const gd::EventsBasedObject& eventsBasedObject,
+      const gd::EventsFunction& eventsFunction,
+      gd::ObjectsContainer& outputGlobalObjectsContainer,
+      gd::ObjectsContainer& outputObjectsContainer);
 };
 }  // namespace gd

--- a/Core/GDCore/IDE/Project/ArbitraryObjectsWorker.cpp
+++ b/Core/GDCore/IDE/Project/ArbitraryObjectsWorker.cpp
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>

-#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/String.h"
@@ -36,7 +36,7 @@ void ArbitraryObjectsWorker::VisitObject(gd::Object& object) {
    VisitBehavior(object.GetBehavior(behaviorName));
 }

-void ArbitraryObjectsWorker::VisitBehavior(gd::BehaviorContent& behavior) {
+void ArbitraryObjectsWorker::VisitBehavior(gd::Behavior& behavior) {
  DoVisitBehavior(behavior);
 }

--- a/Core/GDCore/IDE/Project/ArbitraryObjectsWorker.h
+++ b/Core/GDCore/IDE/Project/ArbitraryObjectsWorker.h
@@ -15,7 +15,7 @@
 namespace gd {
 class Object;
 class ObjectsContainer;
-class BehaviorContent;
+class Behavior;
 }  // namespace gd

 namespace gd {
@@ -40,7 +40,7 @@ class GD_CORE_API ArbitraryObjectsWorker {
 private:
  void VisitObjectContainer(gd::ObjectsContainer& objects);
  void VisitObject(gd::Object& object);
-  void VisitBehavior(gd::BehaviorContent& instruction);
+  void VisitBehavior(gd::Behavior& behavior);

  /**
   * Called to do some work on an object container.
@@ -55,7 +55,7 @@ class GD_CORE_API ArbitraryObjectsWorker {
  /**
   * Called to do some work on a behavior.
   */
-  virtual void DoVisitBehavior(gd::BehaviorContent& instruction){};
+  virtual void DoVisitBehavior(gd::Behavior& behavior){};
 };

 }  // namespace gd
--- a/Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp
+++ b/Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp
@@ -111,7 +111,7 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
  ResourceWorkerInEventsWorker(const gd::Project& project_,
                               gd::ArbitraryResourceWorker& worker_)
      : project(project_), worker(worker_){};
-  virtual ~ResourceWorkerInEventsWorker() {};
+  virtual ~ResourceWorkerInEventsWorker(){};

 private:
  bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) {
@@ -131,7 +131,8 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
                             const gd::String& lastObjectName) {
          const String& parameterValue = parameterExpression.GetPlainString();
          if (parameterMetadata.GetType() ==
-              "police") {  // Should be renamed fontResource
+                  "police" ||  // Should be renamed fontResource
+              parameterMetadata.GetType() == "fontResource") {
            gd::String updatedParameterValue = parameterValue;
            worker.ExposeFont(updatedParameterValue);
            instruction.SetParameter(parameterIndex, updatedParameterValue);
@@ -149,6 +150,10 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
            gd::String updatedParameterValue = parameterValue;
            worker.ExposeImage(updatedParameterValue);
            instruction.SetParameter(parameterIndex, updatedParameterValue);
+          } else if (parameterMetadata.GetType() == "jsonResource") {
+            gd::String updatedParameterValue = parameterValue;
+            worker.ExposeJson(updatedParameterValue);
+            instruction.SetParameter(parameterIndex, updatedParameterValue);
          }
        });

--- a/Core/GDCore/IDE/ProjectStripper.cpp
+++ b/Core/GDCore/IDE/ProjectStripper.cpp
@@ -5,6 +5,8 @@
 */
 #include "ProjectStripper.h"

+#include "GDCore/Project/EventsFunctionsContainer.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
@@ -12,7 +14,7 @@

 namespace gd {

-void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project& project) {
+void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
  project.GetObjectGroups().Clear();
  while (project.GetExternalEventsCount() > 0)
    project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
@@ -22,7 +24,28 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project& project) {
    project.GetLayout(i).GetEvents().Clear();
  }

-  project.ClearEventsFunctionsExtensions();
+  // Keep the EventsBasedObject object list because it's useful for the Runtime
+  // to create the child-object.
+  for (unsigned int extensionIndex = 0;
+       extensionIndex < project.GetEventsFunctionsExtensionsCount();
+       ++extensionIndex) {
+    auto &extension = project.GetEventsFunctionsExtension(extensionIndex);
+    auto &eventsBasedObjects = extension.GetEventsBasedObjects();
+    if (eventsBasedObjects.size() == 0) {
+      project.RemoveEventsFunctionsExtension(extension.GetName());
+      extensionIndex--;
+      continue;
+    }
+    for (unsigned int objectIndex = 0; objectIndex < eventsBasedObjects.size();
+         ++objectIndex) {
+      auto &eventsBasedObject = eventsBasedObjects.at(objectIndex);
+      eventsBasedObject.SetFullName("");
+      eventsBasedObject.SetDescription("");
+      eventsBasedObject.GetEventsFunctions().GetInternalVector().clear();
+      eventsBasedObject.GetPropertyDescriptors().GetInternalVector().clear();
+    }
+    extension.GetEventsBasedBehaviors().Clear();
+  }
 }

-}  // namespace gd
+} // namespace gd
--- a/Core/GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h
+++ b/Core/GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h
@@ -11,7 +11,7 @@
 namespace gd {
 class Project;
 class Object;
-class BehaviorContent;
+class Behavior;
 }  // namespace gd

 namespace gd {
@@ -24,12 +24,12 @@ class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
  UnfilledRequiredBehaviorPropertyProblem(
      const gd::Project& sourceProject_,
      gd::Object& sourceObject_,
-      gd::BehaviorContent& sourceBehaviorContent_,
+      gd::Behavior& sourceBehavior_,
      const gd::String& sourcePropertyName_,
      const gd::String& expectedBehaviorTypeName_)
      : sourceProject(sourceProject_),
      sourceObject(sourceObject_),
-      sourceBehaviorContent(sourceBehaviorContent_),
+      sourceBehavior(sourceBehavior_),
      sourcePropertyName(sourcePropertyName_),
      expectedBehaviorTypeName(expectedBehaviorTypeName_){};
  virtual ~UnfilledRequiredBehaviorPropertyProblem();
@@ -47,8 +47,8 @@ class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
  /**
   * \brief Return the behavior where the problem appears.
   */
-  virtual gd::BehaviorContent& GetSourceBehaviorContent() const {
-    return sourceBehaviorContent;
+  virtual gd::Behavior& GetSourceBehaviorContent() const {
+    return sourceBehavior;
  }

  /**
@@ -69,7 +69,7 @@ class GD_CORE_API UnfilledRequiredBehaviorPropertyProblem {
 private:
  const gd::Project& sourceProject;
  gd::Object& sourceObject;
-  gd::BehaviorContent& sourceBehaviorContent;
+  gd::Behavior& sourceBehavior;
  const gd::String sourcePropertyName;

  const gd::String expectedBehaviorTypeName;
--- a/Core/GDCore/IDE/WholeProjectRefactorer.cpp
+++ b/Core/GDCore/IDE/WholeProjectRefactorer.cpp
@@ -11,6 +11,8 @@
 #include "GDCore/IDE/DependenciesAnalyzer.h"
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 #include "GDCore/IDE/Events/EventsBehaviorRenamer.h"
+#include "GDCore/IDE/Events/CustomObjectTypeRenamer.h"
+#include "GDCore/IDE/Events/BehaviorTypeRenamer.h"
 #include "GDCore/IDE/Events/EventsRefactorer.h"
 #include "GDCore/IDE/Events/ExpressionsParameterMover.h"
 #include "GDCore/IDE/Events/ExpressionsRenamer.h"
@@ -20,8 +22,9 @@
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/BehaviorConfigurationContainer.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
@@ -53,6 +56,17 @@ gd::String GetBehaviorFullType(const gd::String& extensionName,
  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
  return extensionName + separator + behaviorName;
 }
+gd::String GetObjectEventsFunctionFullType(const gd::String& extensionName,
+                                             const gd::String& objectName,
+                                             const gd::String& functionName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + objectName + separator + functionName;
+}
+gd::String GetObjectFullType(const gd::String& extensionName,
+                               const gd::String& objectName) {
+  const auto& separator = gd::PlatformExtension::GetNamespaceSeparator();
+  return extensionName + separator + objectName;
+}
 }  // namespace

 namespace gd {
@@ -60,6 +74,9 @@ namespace gd {
 // By convention, the first parameter of an events based behavior method is
 // always called "Object".
 const gd::String WholeProjectRefactorer::behaviorObjectParameterName = "Object";
+// By convention, the first parameter of an events based object method is
+// always called "Object".
+const gd::String WholeProjectRefactorer::parentObjectParameterName = "Object";

 void WholeProjectRefactorer::ExposeProjectEvents(
    gd::Project& project, gd::ArbitraryEventsWorker& worker) {
@@ -93,6 +110,17 @@ void WholeProjectRefactorer::ExposeProjectEvents(
        worker.Launch(eventsFunction->GetEvents());
      }
    }
+
+    // Add (object) events functions
+    for (auto&& eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects()
+             .GetInternalVector()) {
+      auto& objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
+      for (auto&& eventsFunction :
+           objectEventsFunctions.GetInternalVector()) {
+        worker.Launch(eventsFunction->GetEvents());
+      }
+    }
  }
 }

@@ -139,6 +167,13 @@ void WholeProjectRefactorer::ExposeProjectEvents(
             .GetInternalVector()) {
      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
    }
+
+    // Add (object) events functions
+    for (auto&& eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects()
+             .GetInternalVector()) {
+      ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
+    }
  }
 }

@@ -162,11 +197,49 @@ void WholeProjectRefactorer::ExposeEventsBasedBehaviorEvents(
  }
 }

+void WholeProjectRefactorer::ExposeEventsBasedObjectEvents(
+    gd::Project& project,
+    const gd::EventsBasedObject& eventsBasedObject,
+    gd::ArbitraryEventsWorkerWithContext& worker) {
+  auto& objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
+  for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
+    gd::ObjectsContainer globalObjectsAndGroups;
+    gd::ObjectsContainer objectsAndGroups;
+    gd::EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
+        project,
+        eventsBasedObject,
+        *eventsFunction,
+        globalObjectsAndGroups,
+        objectsAndGroups);
+
+    worker.Launch(
+        eventsFunction->GetEvents(), globalObjectsAndGroups, objectsAndGroups);
+  }
+}
+
 void WholeProjectRefactorer::ExposeProjectObjects(
    gd::Project& project, gd::ArbitraryObjectsWorker& worker) {
+
+  // Global objects
  worker.Launch(project);
-  for (size_t i = 0; i < project.GetLayoutsCount(); i++)
+
+  // Layers objects
+  for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
    worker.Launch(project.GetLayout(i));
+  }
+
+  // Event based objects children
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+      e++) {
+    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+
+    for (auto&& eventsBasedObjectUniquePtr :
+        eventsFunctionsExtension.GetEventsBasedObjects()
+            .GetInternalVector()) {
+      auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
+      worker.Launch(*eventsBasedObject);
+    }
+  }
 };

 std::set<gd::String>
@@ -181,8 +254,8 @@ WholeProjectRefactorer::GetAllObjectTypesUsingEventsBasedBehavior(
  auto addTypesOfObjectsIn =
      [&allTypes, &behaviorType](const gd::ObjectsContainer& objectsContainer) {
        for (auto& object : objectsContainer.GetObjects()) {
-          for (auto& behaviorContent : object->GetAllBehaviorContents()) {
-            if (behaviorContent.second->GetTypeName() == behaviorType) {
+          for (auto& behavior : object->GetAllBehaviorContents()) {
+            if (behavior.second->GetTypeName() == behaviorType) {
              allTypes.insert(object->GetType());
            }
          }
@@ -223,6 +296,26 @@ void WholeProjectRefactorer::EnsureBehaviorEventsFunctionsProperParameters(
  }
 }

+void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
+    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+    const gd::EventsBasedObject& eventsBasedObject) {
+  for (auto& eventsFunction :
+       eventsBasedObject.GetEventsFunctions().GetInternalVector()) {
+    auto& parameters = eventsFunction->GetParameters();
+    while (parameters.size() < 1) {
+      gd::ParameterMetadata newParameter;
+      parameters.push_back(newParameter);
+    }
+
+    parameters[0]
+        .SetType("object")
+        .SetName(parentObjectParameterName)
+        .SetDescription("Object")
+        .SetExtraInfo(GetObjectFullType(eventsFunctionsExtension.GetName(),
+                                        eventsBasedObject.GetName()));
+  }
+}
+
 void WholeProjectRefactorer::RenameEventsFunctionsExtension(
    gd::Project& project,
    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
@@ -297,6 +390,66 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        // extension name
      };

+  auto renameObjectEventsFunction =
+      [&project, &oldName, &newName](
+          const gd::EventsBasedObject& eventsBasedObject,
+          const gd::EventsFunction& eventsFunction) {
+        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+          gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+              project,
+              GetObjectEventsFunctionFullType(oldName,
+                                                eventsBasedObject.GetName(),
+                                                eventsFunction.GetName()),
+              GetObjectEventsFunctionFullType(newName,
+                                                eventsBasedObject.GetName(),
+                                                eventsFunction.GetName()));
+          ExposeProjectEvents(project, renamer);
+        } else if (eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::Expression ||
+                   eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::StringExpression) {
+          // Nothing to do, expressions are not including the extension name
+        }
+      };
+
+  auto renameObjectPropertyFunctions =
+      [&project, &oldName, &newName](
+          const gd::EventsBasedObject& eventsBasedObject,
+          const gd::NamedPropertyDescriptor& property) {
+        gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+            project,
+            GetObjectEventsFunctionFullType(
+                oldName,
+                eventsBasedObject.GetName(),
+                gd::EventsBasedObject::GetPropertyActionName(
+                    property.GetName())),
+            GetObjectEventsFunctionFullType(
+                newName,
+                eventsBasedObject.GetName(),
+                gd::EventsBasedObject::GetPropertyActionName(
+                    property.GetName())));
+        ExposeProjectEvents(project, actionRenamer);
+
+        gd::InstructionsTypeRenamer conditionRenamer =
+            gd::InstructionsTypeRenamer(
+                project,
+                GetObjectEventsFunctionFullType(
+                    oldName,
+                    eventsBasedObject.GetName(),
+                    gd::EventsBasedObject::GetPropertyConditionName(
+                        property.GetName())),
+                GetObjectEventsFunctionFullType(
+                    newName,
+                    eventsBasedObject.GetName(),
+                    gd::EventsBasedObject::GetPropertyConditionName(
+                        property.GetName())));
+        ExposeProjectEvents(project, conditionRenamer);
+
+        // Nothing to do for expressions, expressions are not including the
+        // extension name
+      };
+
  // Order is important: we first rename the expressions then the instructions,
  // to avoid being unable to fetch the metadata (the types of parameters) of
  // instructions after they are renamed.
@@ -352,6 +505,28 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
    }
  }

+  // Object instructions
+  for (auto&& eventsBasedObject :
+       eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+    auto& objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
+    for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
+      if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+          eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+        renameObjectEventsFunction(*eventsBasedObject, *eventsFunction);
+      }
+    }
+  }
+
+  // Object properties
+  for (auto&& eventsBasedObject :
+       eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+    auto& objectProperties = eventsBasedObject->GetPropertyDescriptors();
+    for (auto&& propertyDescriptor : objectProperties.GetInternalVector()) {
+      renameObjectPropertyFunctions(*eventsBasedObject,
+                                      *propertyDescriptor);
+    }
+  }
+
  // Finally, rename behaviors used in objects
  for (auto&& eventsBasedBehavior :
       eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
@@ -360,6 +535,15 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
        GetBehaviorFullType(oldName, eventsBasedBehavior->GetName()),
        GetBehaviorFullType(newName, eventsBasedBehavior->GetName()));
  }
+
+  // Finally, rename custom objects type
+  for (auto&& eventsBasedObject :
+       eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+    DoRenameObject(
+        project,
+        GetObjectFullType(oldName, eventsBasedObject->GetName()),
+        GetObjectFullType(newName, eventsBasedObject->GetName()));
+  }
 }

 void WholeProjectRefactorer::RenameEventsFunction(
@@ -419,6 +603,44 @@ void WholeProjectRefactorer::RenameBehaviorEventsFunction(
  }
 }

+void WholeProjectRefactorer::RenameObjectEventsFunction(
+    gd::Project& project,
+    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+    const gd::EventsBasedObject& eventsBasedObject,
+    const gd::String& oldFunctionName,
+    const gd::String& newFunctionName) {
+  auto& eventsFunctions = eventsBasedObject.GetEventsFunctions();
+  if (!eventsFunctions.HasEventsFunctionNamed(oldFunctionName)) return;
+
+  const gd::EventsFunction& eventsFunction =
+      eventsFunctions.GetEventsFunction(oldFunctionName);
+
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+        project,
+        GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedObject.GetName(),
+                                          oldFunctionName),
+        GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                          eventsBasedObject.GetName(),
+                                          newFunctionName));
+    ExposeProjectEvents(project, renamer);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
+    gd::ExpressionsRenamer renamer =
+        gd::ExpressionsRenamer(project.GetCurrentPlatform());
+    renamer.SetReplacedObjectExpression(
+        GetObjectFullType(eventsFunctionsExtension.GetName(),
+                            eventsBasedObject.GetName()),
+        oldFunctionName,
+        newFunctionName);
+    ExposeProjectEvents(project, renamer);
+  }
+}
+
 void WholeProjectRefactorer::MoveEventsFunctionParameter(
    gd::Project& project,
    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
@@ -489,6 +711,45 @@ void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
  }
 }

+void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
+    gd::Project& project,
+    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+    const gd::EventsBasedObject& eventsBasedObject,
+    const gd::String& functionName,
+    std::size_t oldIndex,
+    std::size_t newIndex) {
+  auto& eventsFunctions = eventsBasedObject.GetEventsFunctions();
+  if (!eventsFunctions.HasEventsFunctionNamed(functionName)) return;
+
+  const gd::EventsFunction& eventsFunction =
+      eventsFunctions.GetEventsFunction(functionName);
+
+  const gd::String& eventsFunctionType =
+      GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
+                                        eventsBasedObject.GetName(),
+                                        functionName);
+
+  if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+      eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+    gd::InstructionsParameterMover mover = gd::InstructionsParameterMover(
+        project, eventsFunctionType, oldIndex, newIndex);
+    ExposeProjectEvents(project, mover);
+  } else if (eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::Expression ||
+             eventsFunction.GetFunctionType() ==
+                 gd::EventsFunction::StringExpression) {
+    gd::ExpressionsParameterMover mover =
+        gd::ExpressionsParameterMover(project.GetCurrentPlatform());
+    mover.SetObjectExpressionMovedParameter(
+        GetObjectFullType(eventsFunctionsExtension.GetName(),
+                            eventsBasedObject.GetName()),
+        functionName,
+        oldIndex,
+        newIndex);
+    ExposeProjectEvents(project, mover);
+  }
+}
+
 void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
    gd::Project& project,
    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
@@ -555,6 +816,55 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
  }
 }

+void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
+    gd::Project& project,
+    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+    const gd::EventsBasedObject& eventsBasedObject,
+    const gd::String& oldPropertyName,
+    const gd::String& newPropertyName) {
+  auto& properties = eventsBasedObject.GetPropertyDescriptors();
+  if (!properties.Has(oldPropertyName)) return;
+
+  // Properties that represent primitive values will be used through
+  // their related actions/conditions/expressions. Rename these.
+
+  // Order is important: we first rename the expressions then the
+  // instructions, to avoid being unable to fetch the metadata (the types of
+  // parameters) of instructions after they are renamed.
+  gd::ExpressionsRenamer expressionRenamer =
+      gd::ExpressionsRenamer(project.GetCurrentPlatform());
+  expressionRenamer.SetReplacedObjectExpression(
+      GetObjectFullType(eventsFunctionsExtension.GetName(),
+                          eventsBasedObject.GetName()),
+      EventsBasedObject::GetPropertyExpressionName(oldPropertyName),
+      EventsBasedObject::GetPropertyExpressionName(newPropertyName));
+  ExposeProjectEvents(project, expressionRenamer);
+
+  gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+      project,
+      GetObjectEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedObject.GetName(),
+          EventsBasedObject::GetPropertyActionName(oldPropertyName)),
+      GetObjectEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedObject.GetName(),
+          EventsBasedObject::GetPropertyActionName(newPropertyName)));
+  ExposeProjectEvents(project, actionRenamer);
+
+  gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
+      project,
+      GetObjectEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedObject.GetName(),
+          EventsBasedObject::GetPropertyConditionName(oldPropertyName)),
+      GetObjectEventsFunctionFullType(
+          eventsFunctionsExtension.GetName(),
+          eventsBasedObject.GetName(),
+          EventsBasedObject::GetPropertyConditionName(newPropertyName)));
+  ExposeProjectEvents(project, conditionRenamer);
+}
+
 void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
    gd::Project& project,
    gd::Object& object,
@@ -575,10 +885,8 @@ void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
    return;
  }

-  gd::Behavior& behavior = behaviorMetadata.Get();
-  gd::BehaviorContent& behaviorContent = object.GetBehavior(behaviorName);
-  for (auto const& keyValue :
-       behavior.GetProperties(behaviorContent.GetContent())) {
+  gd::Behavior& behavior = object.GetBehavior(behaviorName);
+  for (auto const& keyValue : behavior.GetProperties()) {
    const gd::String& propertyName = keyValue.first;
    const gd::PropertyDescriptor& property = keyValue.second;
    if (property.GetType().LowerCase() == "behavior") {
@@ -588,11 +896,11 @@ void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
        continue;
      }
      const gd::String& requiredBehaviorType = extraInfo.at(0);
-      const auto behaviorContents =
+      const auto behaviorNames =
          WholeProjectRefactorer::GetBehaviorsWithType(object,
                                                       requiredBehaviorType);
      const gd::String* defaultBehaviorName = nullptr;
-      if (behaviorContents.size() == 0) {
+      if (behaviorNames.size() == 0) {
        const gd::BehaviorMetadata& requiredBehaviorMetadata =
            MetadataProvider::GetBehaviorMetadata(platform,
                                                  requiredBehaviorType);
@@ -602,10 +910,9 @@ void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
            project, object, requiredBehaviorType, requiredBehaviorName);
        defaultBehaviorName = &requiredBehaviorName;
      } else {
-        defaultBehaviorName = &behaviorContents.at(0);
+        defaultBehaviorName = &behaviorNames.at(0);
      }
-      behavior.UpdateProperty(
-          behaviorContent.GetContent(), propertyName, *defaultBehaviorName);
+      behavior.UpdateProperty(propertyName, *defaultBehaviorName);
    }
  }
 }
@@ -614,9 +921,8 @@ std::vector<gd::String> WholeProjectRefactorer::GetBehaviorsWithType(
    const gd::Object& object, const gd::String& type) {
  std::vector<gd::String> behaviors;
  for (auto& behaviorName : object.GetAllBehaviorNames()) {
-    const gd::BehaviorContent& behaviorContent =
-        object.GetBehavior(behaviorName);
-    if (behaviorContent.GetTypeName() == type) {
+    const gd::Behavior& behavior = object.GetBehavior(behaviorName);
+    if (behavior.GetTypeName() == type) {
      behaviors.push_back(behaviorName);
    }
  }
@@ -644,18 +950,15 @@ void WholeProjectRefactorer::FindDependentBehaviorNames(
    std::unordered_set<gd::String>& dependentBehaviorNames) {
  const gd::Platform& platform = project.GetCurrentPlatform();
  for (auto const& objectBehaviorName : object.GetAllBehaviorNames()) {
-    const gd::BehaviorContent& behaviorContent =
-        object.GetBehavior(objectBehaviorName);
+    const gd::Behavior& behavior = object.GetBehavior(objectBehaviorName);
    const auto& behaviorMetadata = MetadataProvider::GetBehaviorMetadata(
-        platform, behaviorContent.GetTypeName());
+        platform, behavior.GetTypeName());
    if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
      // Ignore this behavior as it's unknown.
      continue;
    }

-    gd::Behavior& behavior = behaviorMetadata.Get();
-    for (auto const& keyValue :
-         behavior.GetProperties(behaviorContent.GetContent())) {
+    for (auto const& keyValue : behavior.GetProperties()) {
      const gd::String& propertyName = keyValue.first;
      const gd::PropertyDescriptor& property = keyValue.second;
      if (property.GetType().LowerCase() == "behavior" &&
@@ -679,25 +982,11 @@ WholeProjectRefactorer::FindInvalidRequiredBehaviorProperties(
      [&project, &invalidRequiredBehaviorProperties](
          const std::vector<std::unique_ptr<gd::Object> >& objectsList) {
        for (auto& object : objectsList) {
-          for (auto& behaviorContentKeyValuePair :
+          for (auto& behaviorKeyValuePair :
               object->GetAllBehaviorContents()) {
-            gd::BehaviorContent& behaviorContent =
-                *behaviorContentKeyValuePair.second;
+            gd::Behavior& behavior = *behaviorKeyValuePair.second;

-            const auto& behaviorMetadata =
-                gd::MetadataProvider::GetBehaviorMetadata(
-                    project.GetCurrentPlatform(),
-                    behaviorContent.GetTypeName());
-            if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-              std::cout << "Could not find metadata for behavior with type \""
-                        << behaviorContent.GetTypeName() << "\"" << std::endl;
-              continue;
-            }
-
-            const auto& behavior = behaviorMetadata.Get();
-
-            for (auto const& keyValue :
-                 behavior.GetProperties(behaviorContent.GetContent())) {
+            for (auto const& keyValue : behavior.GetProperties()) {
              const gd::String& propertyName = keyValue.first;
              const gd::PropertyDescriptor& property = keyValue.second;
              if (property.GetType().LowerCase() != "behavior") {
@@ -719,7 +1008,7 @@ WholeProjectRefactorer::FindInvalidRequiredBehaviorProperties(
                auto problem = UnfilledRequiredBehaviorPropertyProblem(
                    project,
                    *object,
-                    behaviorContent,
+                    behavior,
                    propertyName,
                    requiredBehaviorType);
                invalidRequiredBehaviorProperties.push_back(problem);
@@ -748,21 +1037,15 @@ bool WholeProjectRefactorer::FixInvalidRequiredBehaviorProperties(
    auto& object = problem.GetSourceObject();
    auto suggestedBehaviorNames =
        GetBehaviorsWithType(object, problem.GetExpectedBehaviorTypeName());
-    auto& behaviorContent = problem.GetSourceBehaviorContent();
-    auto& behaviorMetadata = MetadataProvider::GetBehaviorMetadata(
-        project.GetCurrentPlatform(), behaviorContent.GetTypeName());
-    if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-      continue;
-    }
+    auto& behavior = problem.GetSourceBehaviorContent();

-    auto& behavior = behaviorMetadata.Get();
    if (suggestedBehaviorNames.empty()) {
      // No matching behavior on the object.
      // Add required behaviors on the object.

      auto& expectedBehaviorMetadata = MetadataProvider::GetBehaviorMetadata(
          project.GetCurrentPlatform(), problem.GetExpectedBehaviorTypeName());
-      if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
+      if (MetadataProvider::IsBadBehaviorMetadata(expectedBehaviorMetadata)) {
        continue;
      }

@@ -772,13 +1055,11 @@ bool WholeProjectRefactorer::FixInvalidRequiredBehaviorProperties(
                                      object,
                                      problem.GetExpectedBehaviorTypeName(),
                                      newBehaviorName);
-      behavior.UpdateProperty(behaviorContent.GetContent(),
-                              problem.GetSourcePropertyName(),
+      behavior.UpdateProperty(problem.GetSourcePropertyName(),
                              newBehaviorName);
    } else {
      // There is a matching behavior on the object use it by default.
      behavior.UpdateProperty(
-          behaviorContent.GetContent(),
          problem.GetSourcePropertyName(),
          // It's unlikely the object has 2 behaviors of the same type.
          suggestedBehaviorNames[0]);
@@ -897,6 +1178,115 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
      GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName));
 }

+void WholeProjectRefactorer::RenameEventsBasedObject(
+    gd::Project& project,
+    const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+    const gd::String& oldObjectName,
+    const gd::String& newObjectName) {
+  auto& eventsBasedObjects =
+      eventsFunctionsExtension.GetEventsBasedObjects();
+  if (!eventsBasedObjects.Has(oldObjectName)) {
+    gd::LogWarning("Warning, " + oldObjectName +
+                   " was not found when calling RenameEventsBasedObject.");
+    return;
+  }
+  auto& eventsBasedObject = eventsBasedObjects.Get(oldObjectName);
+
+  auto renameObjectEventsFunction =
+      [&project,
+       &eventsFunctionsExtension,
+       &oldObjectName,
+       &newObjectName](const gd::EventsFunction& eventsFunction) {
+        if (eventsFunction.GetFunctionType() == gd::EventsFunction::Action ||
+            eventsFunction.GetFunctionType() == gd::EventsFunction::Condition) {
+          gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
+              project,
+              GetObjectEventsFunctionFullType(
+                  eventsFunctionsExtension.GetName(),
+                  oldObjectName,
+                  eventsFunction.GetName()),
+              GetObjectEventsFunctionFullType(
+                  eventsFunctionsExtension.GetName(),
+                  newObjectName,
+                  eventsFunction.GetName()));
+          ExposeProjectEvents(project, renamer);
+        } else if (eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::Expression ||
+                   eventsFunction.GetFunctionType() ==
+                       gd::EventsFunction::StringExpression) {
+          // Nothing to do, expressions are not including the name of the
+          // object
+        }
+      };
+
+  auto renameObjectProperty = [&project,
+                                 &eventsFunctionsExtension,
+                                 &oldObjectName,
+                                 &newObjectName](
+                                    const gd::NamedPropertyDescriptor&
+                                        property) {
+    gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
+        project,
+        GetObjectEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            oldObjectName,
+            EventsBasedObject::GetPropertyActionName(property.GetName())),
+        GetObjectEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            newObjectName,
+            EventsBasedObject::GetPropertyActionName(property.GetName())));
+    ExposeProjectEvents(project, actionRenamer);
+
+    gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
+        project,
+        GetObjectEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            oldObjectName,
+            EventsBasedObject::GetPropertyConditionName(property.GetName())),
+        GetObjectEventsFunctionFullType(
+            eventsFunctionsExtension.GetName(),
+            newObjectName,
+            EventsBasedObject::GetPropertyConditionName(property.GetName())));
+    ExposeProjectEvents(project, conditionRenamer);
+
+    // Nothing to do for expression, expressions are not including the name of
+    // the object
+  };
+
+  // Order is important: we first rename the expressions then the instructions,
+  // to avoid being unable to fetch the metadata (the types of parameters) of
+  // instructions after they are renamed.
+  auto& objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
+
+  // Object expressions
+  for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Expression ||
+        eventsFunction->GetFunctionType() ==
+            gd::EventsFunction::StringExpression) {
+      renameObjectEventsFunction(*eventsFunction);
+    }
+  }
+
+  // Object instructions
+  for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
+    if (eventsFunction->GetFunctionType() == gd::EventsFunction::Action ||
+        eventsFunction->GetFunctionType() == gd::EventsFunction::Condition) {
+      renameObjectEventsFunction(*eventsFunction);
+    }
+  }
+
+  // Object properties
+  auto& properties = eventsBasedObject.GetPropertyDescriptors();
+  for (auto&& property : properties.GetInternalVector()) {
+    renameObjectProperty(*property);
+  }
+
+  DoRenameObject(
+      project,
+      GetObjectFullType(eventsFunctionsExtension.GetName(), oldObjectName),
+      GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName));
+}
+
 void WholeProjectRefactorer::DoRenameEventsFunction(
    gd::Project& project,
    const gd::EventsFunction& eventsFunction,
@@ -924,18 +1314,9 @@ void WholeProjectRefactorer::DoRenameBehavior(
    const gd::String& newBehaviorType) {
  auto renameBehaviorTypeInBehaviorContent =
      [&oldBehaviorType,
-       &newBehaviorType](gd::BehaviorContent& behaviorContent) {
-        if (behaviorContent.GetTypeName() == oldBehaviorType) {
-          behaviorContent.SetTypeName(newBehaviorType);
-        }
-      };
-  auto renameBehaviorTypeInObjects =
-      [&renameBehaviorTypeInBehaviorContent](
-          std::vector<std::unique_ptr<gd::Object> >& objectsList) {
-        for (auto& object : objectsList) {
-          for (auto& behaviorContent : object->GetAllBehaviorContents()) {
-            renameBehaviorTypeInBehaviorContent(*behaviorContent.second);
-          }
+       &newBehaviorType](gd::BehaviorConfigurationContainer& behavior) {
+        if (behavior.GetTypeName() == oldBehaviorType) {
+          behavior.SetTypeName(newBehaviorType);
        }
      };
  auto renameBehaviorTypeInParameters =
@@ -972,15 +1353,18 @@ void WholeProjectRefactorer::DoRenameBehavior(
      }
    }
  }
+  
+  // Rename behavior in objects lists.
+  auto behaviorTypeRenamer = gd::BehaviorTypeRenamer(
+          project,
+          oldBehaviorType,
+          newBehaviorType);
+  ExposeProjectObjects(project, behaviorTypeRenamer);

-  // Rename behavior in global objects
-  renameBehaviorTypeInObjects(project.GetObjects());
-
-  // Rename behavior in layout objects and layout behavior shared data.
+  // Rename behavior in layout behavior shared data.
  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
    gd::Layout& layout = project.GetLayout(i);

-    renameBehaviorTypeInObjects(layout.GetObjects());
    for (auto& behaviorSharedDataContent : layout.GetAllBehaviorSharedData()) {
      renameBehaviorTypeInBehaviorContent(*behaviorSharedDataContent.second);
    }
@@ -1003,6 +1387,76 @@ void WholeProjectRefactorer::DoRenameBehavior(
        renameBehaviorTypeInParameters(*eventsFunction);
      }
    }
+
+    for (auto&& eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects()
+             .GetInternalVector()) {
+      auto& behaviorEventsFunctions = eventsBasedObject->GetEventsFunctions();
+      for (auto&& eventsFunction :
+           behaviorEventsFunctions.GetInternalVector()) {
+        renameBehaviorTypeInParameters(*eventsFunction);
+      }
+    }
+  }
+}
+
+void WholeProjectRefactorer::DoRenameObject(
+    gd::Project& project,
+    const gd::String& oldObjectType,
+    const gd::String& newObjectType) {
+
+  auto customObjectTypeRenamer = gd::CustomObjectTypeRenamer(
+          project,
+          oldObjectType,
+          newObjectType);
+  ExposeProjectObjects(project, customObjectTypeRenamer);
+
+  auto renameObjectTypeInParameters =
+      [&oldObjectType, &newObjectType](gd::EventsFunction& eventsFunction) {
+        for (auto& parameter : eventsFunction.GetParameters()) {
+          if (gd::ParameterMetadata::IsObject(parameter.GetType()) &&
+              parameter.GetExtraInfo() == oldObjectType) {
+            parameter.SetExtraInfo(newObjectType);
+          }
+        }
+      };
+
+  // Rename in parameters of (free/behavior) events function
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+
+    // Behavior object types
+    for (auto&& eventsBasedBehavior :
+        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
+      if (eventsBasedBehavior->GetObjectType() == oldObjectType) {
+        eventsBasedBehavior->SetObjectType(newObjectType);
+      }
+    }
+
+    for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+      renameObjectTypeInParameters(*eventsFunction);
+    }
+
+    for (auto&& eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
+      for (auto&& eventsFunction :
+           behaviorEventsFunctions.GetInternalVector()) {
+        renameObjectTypeInParameters(*eventsFunction);
+      }
+    }
+
+    for (auto&& eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects()
+             .GetInternalVector()) {
+      auto& behaviorEventsFunctions = eventsBasedObject->GetEventsFunctions();
+      for (auto&& eventsFunction :
+           behaviorEventsFunctions.GetInternalVector()) {
+        renameObjectTypeInParameters(*eventsFunction);
+      }
+    }
  }
 }

@@ -1123,6 +1577,28 @@ void WholeProjectRefactorer::ObjectOrGroupRenamedInLayout(
    }
  }
 }
+
+void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsBasedObject(
+    gd::Project& project,
+    gd::EventsBasedObject& eventsBasedObject,
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::ObjectsContainer& objectsContainer,
+    const gd::String& objectName,
+    bool isObjectGroup,
+    bool removeEventsAndGroups) {
+  for (auto &functionUniquePtr : eventsBasedObject.GetEventsFunctions().GetInternalVector()) {
+    auto function = functionUniquePtr.get();
+    WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction(
+        project,
+        *function,
+        globalObjectsContainer,
+        objectsContainer,
+        objectName,
+        isObjectGroup,
+        isObjectGroup);
+  }
+}
+
 void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction(
    gd::Project& project,
    gd::EventsFunction& eventsFunction,
@@ -1150,6 +1626,26 @@ void WholeProjectRefactorer::ObjectOrGroupRemovedInEventsFunction(
  }
 }

+void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsBasedObject(
+    gd::Project& project,
+    gd::ObjectsContainer& globalObjectsContainer,
+    gd::EventsBasedObject& eventsBasedObject,
+    const gd::String& oldName,
+    const gd::String& newName,
+    bool isObjectGroup) {
+  for (auto &functionUniquePtr : eventsBasedObject.GetEventsFunctions().GetInternalVector()) {
+    auto *function = functionUniquePtr.get();
+    WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
+        project,
+        *function,
+        globalObjectsContainer,
+        eventsBasedObject,
+        oldName,
+        newName,
+        isObjectGroup);
+  }
+}
+
 void WholeProjectRefactorer::ObjectOrGroupRenamedInEventsFunction(
    gd::Project& project,
    gd::EventsFunction& eventsFunction,
--- a/Core/GDCore/IDE/WholeProjectRefactorer.h
+++ b/Core/GDCore/IDE/WholeProjectRefactorer.h
@@ -18,11 +18,11 @@ class EventsFunctionsExtension;
 class EventsFunction;
 class ObjectsContainer;
 class EventsBasedBehavior;
+class EventsBasedObject;
 class ArbitraryEventsWorker;
 class ArbitraryObjectsWorker;
 class ArbitraryEventsWorkerWithContext;
 class Behavior;
-class BehaviorContent;
 class BehaviorMetadata;
 class UnfilledRequiredBehaviorPropertyProblem;
 }  // namespace gd
@@ -61,13 +61,24 @@ class GD_CORE_API WholeProjectRefactorer {
   * \brief Call the specified worker on all events of the events based behavior
   *
   * This should be the preferred way to traverse all the events of an events
-   * based behavior
+   * based behavior.
   */
  static void ExposeEventsBasedBehaviorEvents(
      gd::Project& project,
      const gd::EventsBasedBehavior& eventsBasedBehavior,
      gd::ArbitraryEventsWorkerWithContext& worker);

+  /**
+   * \brief Call the specified worker on all events of the events based object
+   *
+   * This should be the preferred way to traverse all the events of an events
+   * based object.
+   */
+  static void ExposeEventsBasedObjectEvents(
+      gd::Project& project,
+      const gd::EventsBasedObject& eventsBasedObject,
+      gd::ArbitraryEventsWorkerWithContext& worker);
+
  /**
   * \brief Call the specified worker on all ObjectContainers of the project
   * (global, layouts...)
@@ -119,6 +130,21 @@ class GD_CORE_API WholeProjectRefactorer {
      const gd::String& oldFunctionName,
      const gd::String& newFunctionName);

+  /**
+   * \brief Refactor the project **before** an events function of an object is
+   * renamed.
+   *
+   * \warning Do the renaming of the specified function after calling this.
+   * This is because the function is expected to have its old name for the
+   * refactoring.
+   */
+  static void RenameObjectEventsFunction(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::EventsBasedObject& eventsBasedObject,
+      const gd::String& oldFunctionName,
+      const gd::String& newFunctionName);
+
  /**
   * \brief Refactor the project **before** an events function parameter
   * is moved.
@@ -150,6 +176,22 @@ class GD_CORE_API WholeProjectRefactorer {
      std::size_t oldIndex,
      std::size_t newIndex);

+  /**
+   * \brief Refactor the project **before** the parameter of an events function
+   * of an object is moved.
+   *
+   * \warning Do the move of the specified function parameters after calling
+   * this. This is because the function is expected to be in its old state for
+   * the refactoring.
+   */
+  static void MoveObjectEventsFunctionParameter(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::EventsBasedObject& eventsBasedObject,
+      const gd::String& functionName,
+      std::size_t oldIndex,
+      std::size_t newIndex);
+
  /**
   * \brief Refactor the project **before** a property of a behavior is
   * renamed.
@@ -165,6 +207,21 @@ class GD_CORE_API WholeProjectRefactorer {
      const gd::String& oldPropertyName,
      const gd::String& newPropertyName);

+  /**
+   * \brief Refactor the project **before** a property of an object is
+   * renamed.
+   *
+   * \warning Do the renaming of the specified property after calling this.
+   * This is because the property is expected to have its old name for the
+   * refactoring.
+   */
+  static void RenameEventsBasedObjectProperty(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::EventsBasedObject& eventsBasedObject,
+      const gd::String& oldPropertyName,
+      const gd::String& newPropertyName);
+
  /**
   * \brief Add a behavior to an object and add required behaviors if necessary
   * to fill every behavior properties of the added behaviors.
@@ -217,6 +274,19 @@ class GD_CORE_API WholeProjectRefactorer {
      const gd::String& oldBehaviorName,
      const gd::String& newBehaviorName);

+  /**
+   * \brief Refactor the project **before** an object is renamed.
+   *
+   * \warning Do the renaming of the specified object after calling this.
+   * This is because the object is expected to have its old name for the
+   * refactoring.
+   */
+  static void RenameEventsBasedObject(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::String& oldObjectName,
+      const gd::String& newObjectName);
+
  /**
   * \brief Refactor the project after an object is renamed in a layout
   *
@@ -241,6 +311,34 @@ class GD_CORE_API WholeProjectRefactorer {
                                           bool isObjectGroup,
                                           bool removeEventsAndGroups = true);

+  /**
+   * \brief Refactor the project after an object is removed in an events-based
+   * object.
+   *
+   * This will update the events of the function and groups.
+   */
+  static void ObjectOrGroupRemovedInEventsBasedObject(
+      gd::Project& project,
+      gd::EventsBasedObject& eventsBasedObject,
+      gd::ObjectsContainer& globalObjectsContainer,
+      gd::ObjectsContainer& objectsContainer,
+      const gd::String& objectName,
+      bool isObjectGroup,
+      bool removeEventsAndGroups);
+
+  /**
+   * \brief Refactor the events function after an object or group is renamed
+   *
+   * This will update the events of the function and groups.
+   */
+  static void ObjectOrGroupRenamedInEventsBasedObject(
+      gd::Project& project,
+      gd::ObjectsContainer& globalObjectsContainer,
+      gd::EventsBasedObject& eventsBasedObject,
+      const gd::String& oldName,
+      const gd::String& newName,
+      bool isObjectGroup);
+
  /**
   * \brief Refactor the events function after an object or group is renamed
   *
@@ -309,6 +407,14 @@ class GD_CORE_API WholeProjectRefactorer {
      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
      const gd::EventsBasedBehavior& eventsBasedBehavior);

+  /**
+   * \brief Ensure (adding if necessary) that the functions of the given
+   * object have the proper mandatory parameters (the "Object").
+   */
+  static void EnsureObjectEventsFunctionsProperParameters(
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::EventsBasedObject& eventsBasedObject);
+
  virtual ~WholeProjectRefactorer(){};

 private:
@@ -324,6 +430,10 @@ class GD_CORE_API WholeProjectRefactorer {
                               const gd::String& oldBehaviorType,
                               const gd::String& newBehaviorType);

+  static void DoRenameObject(gd::Project& project,
+                             const gd::String& oldObjectType,
+                             const gd::String& newObjectType);
+
  static void FindDependentBehaviorNames(
      const gd::Project& project,
      const gd::Object& object,
@@ -331,6 +441,7 @@ class GD_CORE_API WholeProjectRefactorer {
      std::unordered_set<gd::String>& dependentBehaviorNames);

  static const gd::String behaviorObjectParameterName;
+  static const gd::String parentObjectParameterName;

  WholeProjectRefactorer(){};
 };
--- a/Core/GDCore/Project/AbstractEventsBasedEntity.cpp
+++ b/Core/GDCore/Project/AbstractEventsBasedEntity.cpp
@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "AbstractEventsBasedEntity.h"
+#include "EventsFunctionsContainer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Tools/MakeUnique.h"
+
+namespace gd {
+
+AbstractEventsBasedEntity::AbstractEventsBasedEntity(const gd::String& _name)
+    : name(_name), fullName("") {}
+
+void AbstractEventsBasedEntity::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("description", description);
+  element.SetAttribute("name", name);
+  element.SetAttribute("fullName", fullName);
+
+  gd::SerializerElement& eventsFunctionsElement =
+      element.AddChild("eventsFunctions");
+  eventsFunctionsContainer.SerializeEventsFunctionsTo(eventsFunctionsElement);
+  propertyDescriptors.SerializeElementsTo(
+      "propertyDescriptor", element.AddChild("propertyDescriptors"));
+}
+
+void AbstractEventsBasedEntity::UnserializeFrom(gd::Project& project,
+                                          const SerializerElement& element) {
+  description = element.GetStringAttribute("description");
+  name = element.GetStringAttribute("name");
+  fullName = element.GetStringAttribute("fullName");
+
+  const gd::SerializerElement& eventsFunctionsElement =
+      element.GetChild("eventsFunctions");
+  eventsFunctionsContainer.UnserializeEventsFunctionsFrom(
+      project, eventsFunctionsElement);
+  propertyDescriptors.UnserializeElementsFrom(
+      "propertyDescriptor", element.GetChild("propertyDescriptors"));
+}
+
+}  // namespace gd
--- a/Core/GDCore/Project/AbstractEventsBasedEntity.h
+++ b/Core/GDCore/Project/AbstractEventsBasedEntity.h
@@ -0,0 +1,151 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_ABSTRACTEVENTSBASEDENTITY_H
+#define GDCORE_ABSTRACTEVENTSBASEDENTITY_H
+
+#include <vector>
+#include "GDCore/Project/NamedPropertyDescriptor.h"
+#include "GDCore/Tools/SerializableWithNameList.h"
+#include "GDCore/Project/EventsFunctionsContainer.h"
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+class Project;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Represents a behavior or an object that is implemented with events.
+ *
+ * It's the responsibility of the IDE to run the logic to transform this into a
+ * real behavior or object, by declaring an extension and running code generation.
+ * See `EventsFunctionsExtensionsLoader`.
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API AbstractEventsBasedEntity {
+ public:
+  AbstractEventsBasedEntity(const gd::String& _name);
+  virtual ~AbstractEventsBasedEntity(){};
+
+  /**
+   * \brief Return a pointer to a new AbstractEventsBasedEntity constructed from
+   * this one.
+   */
+  AbstractEventsBasedEntity* Clone() const { return new AbstractEventsBasedEntity(*this); };
+
+  /**
+   * \brief Get the description of the behavior or object, that is displayed in the
+   * editor.
+   */
+  const gd::String& GetDescription() const { return description; };
+
+  /**
+   * \brief Set the description of the behavior or object, to be displayed in the editor.
+   */
+  virtual AbstractEventsBasedEntity& SetDescription(const gd::String& description_) {
+    description = description_;
+    return *this;
+  }
+
+  /**
+   * \brief Get the internal name of the behavior or object.
+   */
+  const gd::String& GetName() const { return name; };
+
+  /**
+   * \brief Set the internal name of the behavior or object.
+   */
+  AbstractEventsBasedEntity& SetName(const gd::String& name_) {
+    name = name_;
+    return *this;
+  }
+
+  /**
+   * \brief Get the name of the behavior or object, that is displayed in the editor.
+   */
+  const gd::String& GetFullName() const { return fullName; };
+
+  /**
+   * \brief Set the name of the behavior or object, to be displayed in the editor.
+   */
+  AbstractEventsBasedEntity& SetFullName(const gd::String& fullName_) {
+    fullName = fullName_;
+    return *this;
+  }
+
+  /**
+   * \brief Return a reference to the functions of the events based behavior or object.
+   */
+  EventsFunctionsContainer& GetEventsFunctions() {
+    return eventsFunctionsContainer;
+  }
+
+  /**
+   * \brief Return a const reference to the functions of the events based
+   * behavior or object.
+   */
+  const EventsFunctionsContainer& GetEventsFunctions() const {
+    return eventsFunctionsContainer;
+  }
+
+  /**
+   * \brief Return a reference to the list of the properties.
+   */
+  SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors() {
+    return propertyDescriptors;
+  }
+
+  /**
+   * \brief Return a const reference to the list of the properties.
+   */
+  const SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors()
+      const {
+    return propertyDescriptors;
+  }
+
+  /**
+   * \brief Get the name of the action to change a property.
+   */
+  static gd::String GetPropertyActionName(const gd::String& propertyName) { return "SetProperty" + propertyName; };
+
+  /**
+   * \brief Get the name of the condition to compare a property.
+   */
+  static gd::String GetPropertyConditionName(const gd::String& propertyName) { return "Property" + propertyName; };
+
+  /**
+   * \brief Get the name of the expression to get a property.
+   */
+  static gd::String GetPropertyExpressionName(const gd::String& propertyName) { return "Property" + propertyName; };
+
+  /** \name Serialization
+   */
+  ///@{
+  /**
+   * \brief Serialize the AbstractEventsBasedEntity to the specified element
+   */
+  virtual void SerializeTo(gd::SerializerElement& element) const;
+
+  /**
+   * \brief Load the AbstractEventsBasedEntity from the specified element
+   */
+  virtual void UnserializeFrom(gd::Project& project,
+                       const gd::SerializerElement& element);
+  ///@}
+
+ private:
+  gd::String name;
+  gd::String fullName;
+  gd::String description;
+  gd::EventsFunctionsContainer eventsFunctionsContainer;
+  SerializableWithNameList<NamedPropertyDescriptor> propertyDescriptors;
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_ABSTRACTEVENTSBASEDENTITY_H
--- a/Core/GDCore/Project/Behavior.cpp
+++ b/Core/GDCore/Project/Behavior.cpp
@@ -5,20 +5,10 @@
 */
 #include "GDCore/Project/Behavior.h"
 #include <iostream>
-#if defined(GD_IDE_ONLY)
 #include "GDCore/Project/PropertyDescriptor.h"
-#endif

 namespace gd {

 Behavior::~Behavior(){};

-#if defined(GD_IDE_ONLY)
-std::map<gd::String, gd::PropertyDescriptor> Behavior::GetProperties(
-    const gd::SerializerElement& behaviorContent) const {
-  std::map<gd::String, gd::PropertyDescriptor> nothing;
-  return nothing;
-}
-#endif
-
 }  // namespace gd
--- a/Core/GDCore/Project/Behavior.h
+++ b/Core/GDCore/Project/Behavior.h
@@ -5,86 +5,28 @@
 */
 #ifndef GDCORE_BEHAVIOR_H
 #define GDCORE_BEHAVIOR_H
-#include <map>
+
 #include "GDCore/String.h"
-#if defined(GD_IDE_ONLY)
-namespace gd {
-class PropertyDescriptor;
-}
-#endif
-namespace gd {
-class SerializerElement;
-class Project;
-class Layout;
-}  // namespace gd
+#include "GDCore/Project/BehaviorConfigurationContainer.h"

 namespace gd {

 /**
 * \brief Base class used to represents a behavior that can be applied to an
- * object
+ * object. It stores the content (i.e: the properties) of a behavior of an object.
 *
- * \see gd::BehaviorContent
 * \see gd::BehaviorsSharedData
+ * \see gd::Object
 * \ingroup PlatformDefinition
 */
-class GD_CORE_API Behavior {
+class GD_CORE_API Behavior: public BehaviorConfigurationContainer {
 public:
-  Behavior(){};
+
+  Behavior(): BehaviorConfigurationContainer() {};
+  Behavior(const gd::String& name_, const gd::String& type_)
+      : BehaviorConfigurationContainer(name_, type_) {};
  virtual ~Behavior();
-  virtual Behavior* Clone() const { return new Behavior(*this); }
-
-  /**
-   * \brief Return the type of the behavior
-   */
-  const gd::String& GetTypeName() const { return type; }
-
-  /**
-   * \brief Set the type of the behavior.
-   */
-  void SetTypeName(const gd::String& type_) { type = type_; };
-
-#if defined(GD_IDE_ONLY)
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of the
-   * behavior.
-   *
-   * Implementation example:
-   \code
-      std::map<gd::String, gd::PropertyDescriptor> properties;
-      properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
-
-      return properties;
-   \endcode
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorContent) const;
-
-  /**
-   * \brief Called when the IDE wants to update a custom property of the
-   * behavior
-   *
-   * \return false if the new value cannot be set
-   * \see gd::InitialInstance
-   */
-  virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
-                              const gd::String& name,
-                              const gd::String& value) {
-    return false;
-  };
-#endif
-
-  /**
-   * \brief Called to initialize the content with the default properties
-   * for the behavior.
-   */
-  virtual void InitializeContent(gd::SerializerElement& behaviorContent){};
-
- private:
-  gd::String type;
+  virtual Behavior* Clone() const override { return new Behavior(*this); }
 };

 }  // namespace gd
--- a/Core/GDCore/Project/BehaviorConfigurationContainer.cpp
+++ b/Core/GDCore/Project/BehaviorConfigurationContainer.cpp
@@ -0,0 +1,25 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/Project/BehaviorConfigurationContainer.h"
+#include <iostream>
+#include "GDCore/Project/PropertyDescriptor.h"
+
+namespace gd {
+
+BehaviorConfigurationContainer::~BehaviorConfigurationContainer(){};
+
+
+std::map<gd::String, gd::PropertyDescriptor> BehaviorConfigurationContainer::GetProperties() const {
+    return GetProperties(content);
+  };
+
+std::map<gd::String, gd::PropertyDescriptor> BehaviorConfigurationContainer::GetProperties(
+    const gd::SerializerElement& behaviorContent) const {
+  std::map<gd::String, gd::PropertyDescriptor> nothing;
+  return nothing;
+}
+
+}  // namespace gd
--- a/Core/GDCore/Project/BehaviorConfigurationContainer.h
+++ b/Core/GDCore/Project/BehaviorConfigurationContainer.h
@@ -0,0 +1,155 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
+#define GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
+
+#include <map>
+#include <memory>
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class PropertyDescriptor;
+class SerializerElement;
+class Project;
+class Layout;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Base class for containers of behavior configuration.
+ * They can be attached to objects (Behavior) or layouts (BehaviorsSharedData).
+ * It stores the content (i.e: the properties) of a behavior of an object.
+ *
+ * \see gd::Behavior
+ * \see gd::BehaviorsSharedData
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API BehaviorConfigurationContainer {
+ public:
+
+  BehaviorConfigurationContainer(){};
+  BehaviorConfigurationContainer(const gd::String& name_, const gd::String& type_)
+      : name(name_), type(type_){};
+  virtual ~BehaviorConfigurationContainer();
+  virtual BehaviorConfigurationContainer* Clone() const { return new BehaviorConfigurationContainer(*this); }
+
+  /**
+   * \brief Return the name identifying the behavior
+   */
+  const gd::String& GetName() const { return name; }
+
+  /**
+   * \brief Change the name identifying the behavior
+   */
+  void SetName(const gd::String& name_) { name = name_; }
+
+  /**
+   * \brief Return the type of the behavior
+   */
+  const gd::String& GetTypeName() const { return type; }
+
+  /**
+   * \brief Set the type of the behavior.
+   */
+  void SetTypeName(const gd::String& type_) { type = type_; };
+
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of the
+   * behavior.
+   * 
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
+
+
+  /**
+   * \brief Called when the IDE wants to update a custom property of the
+   * behavior
+   *
+   * \return false if the new value cannot be set
+   * \see gd::InitialInstance
+   */
+  bool UpdateProperty(const gd::String& name, const gd::String& value) {
+    return UpdateProperty(content, name, value);
+  };
+
+  /**
+   * \brief Called to initialize the content with the default properties
+   * for the behavior.
+   */
+  virtual void InitializeContent() {
+    InitializeContent(content);
+  };
+
+  /**
+   * \brief Serialize the behavior content.
+   */
+  virtual void SerializeTo(gd::SerializerElement& element) const {
+    element = content;
+  };
+
+  /**
+   * \brief Unserialize the behavior content.
+   */
+  virtual void UnserializeFrom(const gd::SerializerElement& element) {
+    content = element;
+  };
+
+  const gd::SerializerElement& GetContent() const { return content; };
+  gd::SerializerElement& GetContent() { return content; };
+
+protected:
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of the
+   * behavior.
+   *
+   * Implementation example:
+   \code
+      std::map<gd::String, gd::PropertyDescriptor> properties;
+      properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
+
+      return properties;
+   \endcode
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
+      const gd::SerializerElement& behaviorContent) const;
+
+  /**
+   * \brief Called when the IDE wants to update a custom property of the
+   * behavior
+   *
+   * \return false if the new value cannot be set
+   * \see gd::InitialInstance
+   */
+  virtual bool UpdateProperty(gd::SerializerElement& behaviorContent,
+                              const gd::String& name,
+                              const gd::String& value) {
+    return false;
+  };
+
+  /**
+   * \brief Called to initialize the content with the default properties
+   * for the behavior.
+   */
+  virtual void InitializeContent(gd::SerializerElement& behaviorContent){};
+
+ private:
+  gd::String name;  ///< Name of the behavior
+  gd::String type;  ///< The type of the behavior that is represented. Usually
+                    ///< in the form "ExtensionName::BehaviorTypeName"
+
+  gd::SerializerElement content;  // Storage for the behavior properties
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_BEHAVIORCONFIGURATIONCONTAINER_H
--- a/Core/GDCore/Project/BehaviorContent.cpp
+++ b/Core/GDCore/Project/BehaviorContent.cpp
@@ -1,12 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/Project/BehaviorContent.h"
-
-namespace gd {
-
-BehaviorContent::~BehaviorContent(){};
-
-}  // namespace gd
--- a/Core/GDCore/Project/BehaviorContent.h
+++ b/Core/GDCore/Project/BehaviorContent.h
@@ -1,88 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#ifndef GDCORE_BEHAVIORCONTENT_H
-#define GDCORE_BEHAVIORCONTENT_H
-#include <map>
-#include "GDCore/Serialization/Serializer.h"
-#include "GDCore/String.h"
-#if defined(GD_IDE_ONLY)
-namespace gd {
-class PropertyDescriptor;
-}
-#endif
-namespace gd {
-class SerializerElement;
-class Project;
-class Layout;
-}  // namespace gd
-
-namespace gd {
-
-/**
- * \brief Store the content (i.e: the properties) of a behavior of an object.
- *
- * \see gd::Behavior
- * \see gd::BehaviorsSharedData
- * \see gd::Object
- * \ingroup PlatformDefinition
- */
-class GD_CORE_API BehaviorContent {
- public:
-  BehaviorContent(const gd::String& name_, const gd::String& type_)
-      : name(name_), type(type_){};
-  virtual ~BehaviorContent();
-  virtual BehaviorContent* Clone() const { return new BehaviorContent(*this); }
-
-  /**
-   * \brief Return the name identifying the behavior
-   */
-  virtual const gd::String& GetName() const { return name; }
-
-  /**
-   * \brief Change the name identifying the behavior
-   */
-  virtual void SetName(const gd::String& name_) { name = name_; }
-
-  /**
-   * \brief Get the type of the behavior.
-   */
-  virtual const gd::String& GetTypeName() const { return type; }
-
-  /**
-   * \brief Change the type of the behavior
-   */
-  virtual void SetTypeName(const gd::String& type_) { type = type_; }
-
-#if defined(GD_IDE_ONLY)
-  /**
-   * \brief Serialize the behavior content.
-   */
-  virtual void SerializeTo(gd::SerializerElement& element) const {
-    element = content;
-  };
-#endif
-
-  /**
-   * \brief Unserialize the behavior content.
-   */
-  virtual void UnserializeFrom(const gd::SerializerElement& element) {
-    content = element;
-  };
-
-  const gd::SerializerElement& GetContent() const { return content; };
-  gd::SerializerElement& GetContent() { return content; };
-
- protected:
-  gd::String name;  ///< Name of the behavior
-  gd::String type;  ///< The type of the behavior that is represented. Usually
-                    ///< in the form "ExtensionName::BehaviorTypeName"
-
-  gd::SerializerElement content;  // Storage for the behavior properties
-};
-
-}  // namespace gd
-
-#endif  // GDCORE_BEHAVIORCONTENT_H
--- a/Core/GDCore/Project/BehaviorsSharedData.cpp
+++ b/Core/GDCore/Project/BehaviorsSharedData.cpp
@@ -5,21 +5,11 @@
 */

 #include "GDCore/Project/BehaviorsSharedData.h"
-#if defined(GD_IDE_ONLY)
 #include <map>
 #include "GDCore/Project/PropertyDescriptor.h"
-#endif

 namespace gd {

 BehaviorsSharedData::~BehaviorsSharedData(){};

-#if defined(GD_IDE_ONLY)
-std::map<gd::String, gd::PropertyDescriptor> BehaviorsSharedData::GetProperties(
-    const gd::SerializerElement& behaviorSharedDataContent) const {
-  std::map<gd::String, gd::PropertyDescriptor> nothing;
-  return nothing;
-}
-#endif
-
 }  // namespace gd
--- a/Core/GDCore/Project/BehaviorsSharedData.h
+++ b/Core/GDCore/Project/BehaviorsSharedData.h
@@ -4,19 +4,11 @@
 * reserved. This project is released under the MIT License.
 */

-#ifndef BEHAVIORSSHAREDDATA_H
-#define BEHAVIORSSHAREDDATA_H
+#ifndef GDCORE_BEHAVIORSSHAREDDATA_H
+#define GDCORE_BEHAVIORSSHAREDDATA_H

-#include <map>
-#include <memory>
 #include "GDCore/String.h"
-class BehaviorsRuntimeSharedData;
-namespace gd {
-class SerializerElement;
-class PropertyDescriptor;
-class Project;
-class Layout;
-}  // namespace gd
+#include "GDCore/Project/BehaviorConfigurationContainer.h"

 namespace gd {

@@ -29,63 +21,15 @@ namespace gd {
 *
 * \ingroup GameEngine
 */
-class GD_CORE_API BehaviorsSharedData {
+class GD_CORE_API BehaviorsSharedData: public BehaviorConfigurationContainer {
 public:
-  BehaviorsSharedData(){};
+  BehaviorsSharedData(): BehaviorConfigurationContainer() {};
+  BehaviorsSharedData(const gd::String& name_, const gd::String& type_)
+      : BehaviorConfigurationContainer(name_, type_) {};
  virtual ~BehaviorsSharedData();
-  virtual gd::BehaviorsSharedData* Clone() const {
-    return new BehaviorsSharedData(*this);
-  }
-
-  /**
-   * \brief Return the name identifying the type of the behavior
-   */
-  gd::String GetTypeName() { return type; }
-
-  /**
-   * \brief Change name identifying the type of the behavior.
-   */
-  void SetTypeName(const gd::String& type_) { type = type_; };
-
-#if defined(GD_IDE_ONLY)
-  /**
-   * \brief Called when the IDE wants to know about the properties of the shared
-   data.
-   *
-   * Usage example:
-   \code
-      std::map<gd::String, gd::PropertyDescriptor> properties;
-      properties[_("Initial speed")].SetValue(gd::String::From(initialSpeed));
-
-      return properties;
-   \endcode
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties(
-      const gd::SerializerElement& behaviorSharedDataContent) const;
-
-  /**
-   * \brief Called when the IDE wants to update a property of the shared data
-   *
-   * \return false if the new value cannot be set
-   * \see gd::InitialInstance
-   */
-  virtual bool UpdateProperty(gd::SerializerElement& behaviorSharedDataContent,
-                              const gd::String& name,
-                              const gd::String& value) {
-    return false;
-  };
-#endif
-
-  virtual void InitializeContent(
-      gd::SerializerElement& behaviorSharedDataContent){};
-
- private:
-  gd::String type;  ///< The type indicate of which type is the behavior.
+  virtual BehaviorsSharedData* Clone() const override { return new BehaviorsSharedData(*this); }
 };

 }  // namespace gd

-#endif  // BEHAVIORSSHAREDDATA_H
+#endif  // GDCORE_BEHAVIORSSHAREDDATA_H
--- a/Core/GDCore/Project/CustomBehavior.cpp
+++ b/Core/GDCore/Project/CustomBehavior.cpp
@@ -0,0 +1,119 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "CustomBehavior.h"
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+#include <map>
+
+using namespace gd;
+
+CustomBehavior *CustomBehavior::Clone() const {
+  CustomBehavior *clone = new CustomBehavior(*this);
+  return clone;
+}
+
+std::map<gd::String, gd::PropertyDescriptor> CustomBehavior::GetProperties(
+    const gd::SerializerElement &behaviorContent) const {
+  auto behaviorProperties = std::map<gd::String, gd::PropertyDescriptor>();
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return behaviorProperties;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
+
+  for (auto &property : properties.GetInternalVector()) {
+    const auto &propertyName = property->GetName();
+    const auto &propertyType = property->GetType();
+
+    // TODO Move this into a PropertyDescriptor copy method.
+    auto &newProperty = behaviorProperties[propertyName]
+                            .SetType(property->GetType())
+                            .SetDescription(property->GetDescription())
+                            .SetGroup(property->GetGroup())
+                            .SetLabel(property->GetLabel())
+                            .SetValue(property->GetValue())
+                            .SetHidden(property->IsHidden());
+
+    for (auto &extraInfo : property->GetExtraInfo()) {
+      newProperty.AddExtraInfo(extraInfo);
+    }
+
+    if (behaviorContent.HasChild(propertyName)) {
+      if (propertyType == "String" || propertyType == "Choice" ||
+          propertyType == "Color" || propertyType == "Behavior") {
+        newProperty.SetValue(
+            behaviorContent.GetChild(propertyName).GetStringValue());
+      } else if (propertyType == "Number") {
+        newProperty.SetValue(gd::String::From(
+            behaviorContent.GetChild(propertyName).GetDoubleValue()));
+      } else if (propertyType == "Boolean") {
+        newProperty.SetValue(
+            behaviorContent.GetChild(propertyName).GetBoolValue() ? "true"
+                                                                  : "false");
+      }
+    } else {
+      // No value was serialized for this property. `newProperty`
+      // will have the default value coming from `enumeratedProperty`.
+    }
+  }
+
+  return behaviorProperties;
+}
+
+bool CustomBehavior::UpdateProperty(gd::SerializerElement &behaviorContent,
+                                    const gd::String &propertyName,
+                                    const gd::String &newValue) {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return false;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
+  if (!properties.Has(propertyName)) {
+    return false;
+  }
+  const auto &property = properties.Get(propertyName);
+
+  auto &element = behaviorContent.AddChild(propertyName);
+  const gd::String &propertyType = property.GetType();
+
+  if (propertyType == "String" || propertyType == "Choice" ||
+      propertyType == "Color" || propertyType == "Behavior") {
+    element.SetStringValue(newValue);
+  } else if (propertyType == "Number") {
+    element.SetDoubleValue(newValue.To<double>());
+  } else if (propertyType == "Boolean") {
+    element.SetBoolValue(newValue == "1");
+  }
+
+  return true;
+}
+
+void CustomBehavior::InitializeContent(gd::SerializerElement &behaviorContent) {
+  if (!project.HasEventsBasedBehavior(GetTypeName())) {
+    return;
+  }
+  const auto &eventsBasedBehavior = project.GetEventsBasedBehavior(GetTypeName());
+  const auto &properties = eventsBasedBehavior.GetPropertyDescriptors();
+  for (auto &&property : properties.GetInternalVector()) {
+    auto &element = behaviorContent.AddChild(property->GetName());
+    auto propertyType = property->GetType();
+
+    if (propertyType == "String" || propertyType == "Choice" ||
+        propertyType == "Color" || propertyType == "Behavior") {
+      element.SetStringValue(property->GetValue());
+    } else if (propertyType == "Number") {
+      element.SetDoubleValue(property->GetValue().To<double>());
+    } else if (propertyType == "Boolean") {
+      element.SetBoolValue(property->GetValue() == "true");
+    }
+  }
+}
--- a/Core/GDCore/Project/CustomBehavior.h
+++ b/Core/GDCore/Project/CustomBehavior.h
@@ -0,0 +1,51 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_CUSTOMBEHAVIOR_H
+#define GDCORE_CUSTOMBEHAVIOR_H
+
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+using namespace gd;
+
+namespace gd {
+/**
+ * \brief A gd::Behavior that stores its content in JSON and forward the
+ * properties related functions to Javascript with Emscripten.
+ */
+class CustomBehavior : public gd::Behavior {
+public:
+  CustomBehavior(const gd::String &name,
+                 const Project &project_,
+                 const gd::String &fullType)
+      : Behavior(name, fullType),
+        project(project_) {}
+  CustomBehavior *Clone() const override;
+
+  using Behavior::GetProperties;
+  using Behavior::InitializeContent;
+  using Behavior::UpdateProperty;
+
+protected:
+  virtual std::map<gd::String, gd::PropertyDescriptor>
+  GetProperties(const gd::SerializerElement &behaviorContent) const override;
+  virtual bool UpdateProperty(gd::SerializerElement &behaviorContent,
+                              const gd::String &name,
+                              const gd::String &value) override;
+  virtual void
+  InitializeContent(gd::SerializerElement &behaviorContent) override;
+
+private:
+  const Project &project; ///< The project is used to get the
+                          ///< EventBasedBehavior from the fullType.
+};
+}  // namespace gd
+
+#endif  // GDCORE_CUSTOMBEHAVIOR_H
--- a/Core/GDCore/Project/CustomObjectConfiguration.cpp
+++ b/Core/GDCore/Project/CustomObjectConfiguration.cpp
@@ -0,0 +1,228 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "CustomObjectConfiguration.h"
+
+#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Tools/Log.h"
+
+using namespace gd;
+
+void CustomObjectConfiguration::Init(const gd::CustomObjectConfiguration& objectConfiguration) {
+  project = objectConfiguration.project;
+  objectContent = objectConfiguration.objectContent;
+
+  // There is no default copy for a map of unique_ptr like childObjectConfigurations.
+  childObjectConfigurations.clear();
+  for (auto& it : objectConfiguration.childObjectConfigurations) {
+    childObjectConfigurations[it.first] = it.second->Clone();
+  }
+}
+
+gd::ObjectConfiguration CustomObjectConfiguration::badObjectConfiguration;
+
+std::unique_ptr<gd::ObjectConfiguration> CustomObjectConfiguration::Clone() const {
+  return gd::make_unique<gd::CustomObjectConfiguration>(*this);
+}
+
+gd::ObjectConfiguration &CustomObjectConfiguration::GetChildObjectConfiguration(const gd::String &objectName) {
+  if (!project->HasEventsBasedObject(GetType())) {
+    return badObjectConfiguration;
+  }
+  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
+  
+  if (!eventsBasedObject.HasObjectNamed(objectName)) {
+    gd::LogError("Tried to get the configuration of a child-object:" + objectName
+                + " that doesn't exist in the event-based object: " + GetType());
+    return badObjectConfiguration;
+  }
+
+  auto &childObject = eventsBasedObject.GetObject(objectName);
+  auto configurationPosition = childObjectConfigurations.find(objectName);
+  if (configurationPosition == childObjectConfigurations.end()) {
+    childObjectConfigurations.insert(std::make_pair(
+        objectName,
+        childObject.GetConfiguration().Clone()));
+    return *(childObjectConfigurations[objectName]);
+  }
+  else {
+    auto &pair = *configurationPosition;
+    auto &configuration = pair.second;
+    return *configuration;
+  }
+ }
+
+std::map<gd::String, gd::PropertyDescriptor> CustomObjectConfiguration::GetProperties() const {
+    auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
+    if (!project->HasEventsBasedObject(GetType())) {
+      return objectProperties;
+    }
+    const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
+    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
+
+    for (auto &property : properties.GetInternalVector()) {
+      const auto &propertyName = property->GetName();
+      const auto &propertyType = property->GetType();
+
+      // TODO Move this into a PropertyDescriptor copy method.
+      auto &newProperty = objectProperties[propertyName]
+            .SetType(property->GetType())
+            .SetDescription(property->GetDescription())
+            .SetGroup(property->GetGroup())
+            .SetLabel(property->GetLabel())
+            .SetValue(property->GetValue())
+            .SetHidden(property->IsHidden());
+      
+      for (auto &extraInfo : property->GetExtraInfo()) {
+        newProperty.AddExtraInfo(extraInfo);
+      }
+
+      if (objectContent.HasChild(propertyName)) {
+        if (
+          propertyType == "String" ||
+          propertyType == "Choice" ||
+          propertyType == "Color"
+        ) {
+          newProperty.SetValue(
+            objectContent.GetChild(propertyName).GetStringValue()
+          );
+        } else if (propertyType == "Number") {
+          newProperty.SetValue(
+            gd::String::From(objectContent.GetChild(propertyName).GetDoubleValue())
+          );
+        } else if (propertyType == "Boolean") {
+          newProperty.SetValue(
+            objectContent.GetChild(propertyName).GetBoolValue()
+              ? "true"
+              : "false"
+          );
+        }
+      } else {
+        // No value was serialized for this property. `newProperty`
+        // will have the default value coming from `enumeratedProperty`.
+      }
+    }
+
+    return objectProperties;
+}
+
+bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
+                                  const gd::String& newValue) {
+    if (!project->HasEventsBasedObject(GetType())) {
+      return false;
+    }
+    const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
+    const auto &properties = eventsBasedObject.GetPropertyDescriptors();
+    if (!properties.Has(propertyName)) {
+      return false;
+    }
+    const auto &property = properties.Get(propertyName);
+
+    auto &element = objectContent.AddChild(propertyName);
+    const gd::String &propertyType = property.GetType();
+
+    if (
+      propertyType == "String" ||
+      propertyType == "Choice" ||
+      propertyType == "Color"
+    ) {
+      element.SetStringValue(newValue);
+    } else if (propertyType == "Number") {
+      element.SetDoubleValue(newValue.To<double>());
+    } else if (propertyType == "Boolean") {
+      element.SetBoolValue(newValue == "1");
+    }
+
+    return true;
+}
+
+std::map<gd::String, gd::PropertyDescriptor>
+CustomObjectConfiguration::GetInitialInstanceProperties(
+    const gd::InitialInstance& instance,
+    gd::Project& project,
+    gd::Layout& scene) {
+  return std::map<gd::String, gd::PropertyDescriptor>();
+}
+
+bool CustomObjectConfiguration::UpdateInitialInstanceProperty(
+    gd::InitialInstance& instance,
+    const gd::String& name,
+    const gd::String& value,
+    gd::Project& project,
+    gd::Layout& scene) {
+  return false;
+}
+
+void CustomObjectConfiguration::DoSerializeTo(SerializerElement& element) const {
+  element.AddChild("content") = objectContent;
+  auto &childrenContentElement = element.AddChild("childrenContent");
+  for (auto &pair : childObjectConfigurations) {
+    auto &childName = pair.first;
+    auto &childConfiguration = pair.second;
+    auto &childElement = childrenContentElement.AddChild(childName);
+    childConfiguration->SerializeTo(childElement);
+  }
+}
+void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
+                                               const SerializerElement& element) {
+  objectContent = element.GetChild("content");
+  auto &childrenContentElement = element.GetChild("childrenContent");
+  for (auto &pair : childrenContentElement.GetAllChildren()) {
+    auto &childName = pair.first;
+    auto &childElement = pair.second;
+    auto &childConfiguration = GetChildObjectConfiguration(childName);
+    childConfiguration.UnserializeFrom(project, *childElement);
+  }
+}
+
+void CustomObjectConfiguration::ExposeResources(
+    gd::ArbitraryResourceWorker& worker) {
+  std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
+
+  for (auto& property : properties) {
+    const String& propertyName = property.first;
+    const gd::PropertyDescriptor& propertyDescriptor = property.second;
+    if (propertyDescriptor.GetType() == "resource") {
+      auto& extraInfo = propertyDescriptor.GetExtraInfo();
+      const gd::String& resourceType = extraInfo.empty() ? "" : extraInfo[0];
+      const gd::String& oldPropertyValue = propertyDescriptor.GetValue();
+
+      gd::String newPropertyValue = oldPropertyValue;
+      if (resourceType == "image") {
+        worker.ExposeImage(newPropertyValue);
+      } else if (resourceType == "audio") {
+        worker.ExposeAudio(newPropertyValue);
+      } else if (resourceType == "font") {
+        worker.ExposeFont(newPropertyValue);
+      } else if (resourceType == "video") {
+        worker.ExposeVideo(newPropertyValue);
+      } else if (resourceType == "json") {
+        worker.ExposeJson(newPropertyValue);
+      } else if (resourceType == "bitmapFont") {
+        worker.ExposeBitmapFont(newPropertyValue);
+      }
+
+      if (newPropertyValue != oldPropertyValue) {
+        UpdateProperty(propertyName, newPropertyValue);
+      }
+    }
+  }
+
+  auto objectProperties = std::map<gd::String, gd::PropertyDescriptor>();
+  if (!project->HasEventsBasedObject(GetType())) {
+    return;
+  }
+  const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
+
+  for (auto& childObject : eventsBasedObject.GetObjects()) {
+    auto &configuration = GetChildObjectConfiguration(childObject->GetName());
+    configuration.ExposeResources(worker);
+  }
+}
--- a/Core/GDCore/Project/CustomObjectConfiguration.h
+++ b/Core/GDCore/Project/CustomObjectConfiguration.h
@@ -0,0 +1,100 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_CUSTOMOBJECTCONFIGURATION_H
+#define GDCORE_CUSTOMOBJECTCONFIGURATION_H
+
+#include "GDCore/Project/ObjectConfiguration.h"
+
+#include <map>
+#include <memory>
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+
+using namespace gd;
+
+namespace gd {
+/**
+ * \brief A gd::ObjectConfiguration that stores its content in JSON and is
+ * composed of other configuration according to it's object children.
+ *
+ * It also implements "ExposeResources" to expose the properties of type
+ * "resource".
+ */
+class CustomObjectConfiguration : public gd::ObjectConfiguration {
+ public:
+  CustomObjectConfiguration(const Project& project_, const String& type_)
+      : project(&project_) {
+    SetType(type_);
+  }
+  std::unique_ptr<gd::ObjectConfiguration> Clone() const override;
+
+  /**
+   * Copy constructor. Calls Init().
+   */
+  CustomObjectConfiguration(const gd::CustomObjectConfiguration& object)
+      : ObjectConfiguration(object) {
+    Init(object);
+  };
+
+  /**
+   * Assignment operator. Calls Init().
+   */
+  CustomObjectConfiguration& operator=(const gd::CustomObjectConfiguration& object){
+    if ((this) != &object) {
+        ObjectConfiguration::operator=(object);
+        Init(object);
+    }
+    return *this;
+  }
+
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+
+  std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
+      const gd::InitialInstance& instance,
+      gd::Project& project,
+      gd::Layout& scene) override;
+  bool UpdateInitialInstanceProperty(gd::InitialInstance& instance,
+                                     const gd::String& name,
+                                     const gd::String& value,
+                                     gd::Project& project,
+                                     gd::Layout& scene) override;
+
+  void ExposeResources(gd::ArbitraryResourceWorker& worker) override;
+
+  gd::ObjectConfiguration &GetChildObjectConfiguration(const gd::String& objectName);
+
+ protected:
+  void DoSerializeTo(SerializerElement& element) const override;
+  void DoUnserializeFrom(Project& project, const SerializerElement& element) override;
+
+ private:
+  const Project* project; ///< The project is used to get the
+                          ///< EventBasedObject from the fullType.
+  gd::SerializerElement objectContent;
+  std::map<gd::String, std::unique_ptr<gd::ObjectConfiguration>> childObjectConfigurations;
+
+  static gd::ObjectConfiguration badObjectConfiguration;
+
+  /**
+   * Initialize configuration using another configuration. Used by copy-ctor
+   * and assign-op.
+   * 
+   * Don't forget to update me if members were changed!
+   * 
+   * It's needed because there is no default copy for childObjectConfigurations
+   * and it must be a deep copy.
+   */
+  void Init(const gd::CustomObjectConfiguration& object);
+};
+}  // namespace gd
+
+#endif  // GDCORE_CUSTOMOBJECTCONFIGURATION_H
--- a/Core/GDCore/Project/EffectsContainer.h
+++ b/Core/GDCore/Project/EffectsContainer.h
@@ -110,6 +110,11 @@ class GD_CORE_API EffectsContainer {
   */
  void UnserializeFrom(const SerializerElement& element);

+  /**
+   * \brief Clear all effects of the container.
+   */
+  inline void Clear() { effects.clear(); }
+
 private:
  std::vector<std::shared_ptr<gd::Effect>> effects;
  static Effect badEffect;
--- a/Core/GDCore/Project/EventsBasedBehavior.cpp
+++ b/Core/GDCore/Project/EventsBasedBehavior.cpp
@@ -3,7 +3,6 @@
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#if defined(GD_IDE_ONLY)
 #include "EventsBasedBehavior.h"
 #include "EventsFunctionsContainer.h"
 #include "GDCore/Serialization/SerializerElement.h"
@@ -12,36 +11,17 @@
 namespace gd {

 EventsBasedBehavior::EventsBasedBehavior()
-    : name("MyBehavior"), fullName("") {}
+    : AbstractEventsBasedEntity("MyBehavior") {}

 void EventsBasedBehavior::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("description", description);
-  element.SetAttribute("name", name);
-  element.SetAttribute("fullName", fullName);
+  AbstractEventsBasedEntity::SerializeTo(element);
  element.SetAttribute("objectType", objectType);
-
-  gd::SerializerElement& eventsFunctionsElement =
-      element.AddChild("eventsFunctions");
-  eventsFunctionsContainer.SerializeEventsFunctionsTo(eventsFunctionsElement);
-  propertyDescriptors.SerializeElementsTo(
-      "propertyDescriptor", element.AddChild("propertyDescriptors"));
 }

 void EventsBasedBehavior::UnserializeFrom(gd::Project& project,
                                          const SerializerElement& element) {
-  description = element.GetStringAttribute("description");
-  name = element.GetStringAttribute("name");
-  fullName = element.GetStringAttribute("fullName");
+  AbstractEventsBasedEntity::UnserializeFrom(project, element);
  objectType = element.GetStringAttribute("objectType");
-
-  const gd::SerializerElement& eventsFunctionsElement =
-      element.GetChild("eventsFunctions");
-  eventsFunctionsContainer.UnserializeEventsFunctionsFrom(
-      project, eventsFunctionsElement);
-  propertyDescriptors.UnserializeElementsFrom(
-      "propertyDescriptor", element.GetChild("propertyDescriptors"));
 }

 }  // namespace gd
-
-#endif
--- a/Core/GDCore/Project/EventsBasedBehavior.h
+++ b/Core/GDCore/Project/EventsBasedBehavior.h
@@ -3,11 +3,11 @@
 * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
 * reserved. This project is released under the MIT License.
 */
-#if defined(GD_IDE_ONLY)
 #ifndef GDCORE_EVENTSBASEDBEHAVIOR_H
 #define GDCORE_EVENTSBASEDBEHAVIOR_H

 #include <vector>
+#include "GDCore/Project/AbstractEventsBasedEntity.h"
 #include "GDCore/Project/NamedPropertyDescriptor.h"
 #include "GDCore/Tools/SerializableWithNameList.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
@@ -28,7 +28,7 @@ namespace gd {
 *
 * \ingroup PlatformDefinition
 */
-class GD_CORE_API EventsBasedBehavior {
+class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
 public:
  EventsBasedBehavior();
  virtual ~EventsBasedBehavior(){};
@@ -39,43 +39,24 @@ class GD_CORE_API EventsBasedBehavior {
   */
  EventsBasedBehavior* Clone() const { return new EventsBasedBehavior(*this); };

-  /**
-   * \brief Get the description of the behavior, that is displayed in the
-   * editor.
-   */
-  const gd::String& GetDescription() const { return description; };
-
-  /**
-   * \brief Set the description of the behavior, to be displayed in the editor.
-   */
-  EventsBasedBehavior& SetDescription(const gd::String& description_) {
-    description = description_;
+  EventsBasedBehavior& SetDescription(const gd::String& description_) override {
+    AbstractEventsBasedEntity::SetDescription(description_);
    return *this;
  }

-  /**
-   * \brief Get the internal name of the behavior.
-   */
-  const gd::String& GetName() const { return name; };
-
  /**
   * \brief Set the internal name of the behavior.
   */
  EventsBasedBehavior& SetName(const gd::String& name_) {
-    name = name_;
+    AbstractEventsBasedEntity::SetName(name_);
    return *this;
  }

-  /**
-   * \brief Get the name of the behavior, that is displayed in the editor.
-   */
-  const gd::String& GetFullName() const { return fullName; };
-
  /**
   * \brief Set the name of the behavior, to be displayed in the editor.
   */
  EventsBasedBehavior& SetFullName(const gd::String& fullName_) {
-    fullName = fullName_;
+    AbstractEventsBasedEntity::SetFullName(fullName_);
    return *this;
  }

@@ -92,76 +73,15 @@ class GD_CORE_API EventsBasedBehavior {
    return *this;
  }

-  /**
-   * \brief Return a reference to the functions of the events based behavior.
-   */
-  EventsFunctionsContainer& GetEventsFunctions() {
-    return eventsFunctionsContainer;
-  }
+  void SerializeTo(SerializerElement& element) const override;

-  /**
-   * \brief Return a const reference to the functions of the events based
-   * behavior.
-   */
-  const EventsFunctionsContainer& GetEventsFunctions() const {
-    return eventsFunctionsContainer;
-  }
-
-  /**
-   * \brief Return a reference to the list of the properties.
-   */
-  SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors() {
-    return propertyDescriptors;
-  }
-
-  /**
-   * \brief Return a const reference to the list of the properties.
-   */
-  const SerializableWithNameList<NamedPropertyDescriptor>& GetPropertyDescriptors()
-      const {
-    return propertyDescriptors;
-  }
-
-  /**
-   * \brief Get the name of the action to change a property.
-   */
-  static gd::String GetPropertyActionName(const gd::String& propertyName) { return "SetProperty" + propertyName; };
-
-  /**
-   * \brief Get the name of the condition to compare a property.
-   */
-  static gd::String GetPropertyConditionName(const gd::String& propertyName) { return "Property" + propertyName; };
-
-  /**
-   * \brief Get the name of the expression to get a property.
-   */
-  static gd::String GetPropertyExpressionName(const gd::String& propertyName) { return "Property" + propertyName; };
-
-  /** \name Serialization
-   */
-  ///@{
-  /**
-   * \brief Serialize the EventsBasedBehavior to the specified element
-   */
-  void SerializeTo(gd::SerializerElement& element) const;
-
-  /**
-   * \brief Load the EventsBasedBehavior from the specified element
-   */
  void UnserializeFrom(gd::Project& project,
-                       const gd::SerializerElement& element);
-  ///@}
+                       const SerializerElement& element) override;

 private:
-  gd::String name;
-  gd::String fullName;
-  gd::String description;
  gd::String objectType;
-  gd::EventsFunctionsContainer eventsFunctionsContainer;
-  SerializableWithNameList<NamedPropertyDescriptor> propertyDescriptors;
 };

 }  // namespace gd

 #endif  // GDCORE_EVENTSBASEDBEHAVIOR_H
-#endif
--- a/Core/GDCore/Project/EventsBasedObject.cpp
+++ b/Core/GDCore/Project/EventsBasedObject.cpp
@@ -0,0 +1,40 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "EventsBasedObject.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+EventsBasedObject::EventsBasedObject()
+    : AbstractEventsBasedEntity("MyObject"), ObjectsContainer() {
+}
+
+EventsBasedObject::~EventsBasedObject() {}
+    
+EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject)
+        : AbstractEventsBasedEntity(_eventBasedObject) {
+  // TODO Add a copy constructor in ObjectsContainer.
+  initialObjects = gd::Clone(_eventBasedObject.initialObjects);
+  objectGroups = _eventBasedObject.objectGroups;
+}
+
+void EventsBasedObject::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("defaultName", defaultName);
+
+  AbstractEventsBasedEntity::SerializeTo(element);
+  SerializeObjectsTo(element.AddChild("objects"));
+}
+
+void EventsBasedObject::UnserializeFrom(gd::Project& project,
+                                          const SerializerElement& element) {
+  defaultName = element.GetStringAttribute("defaultName");
+
+  AbstractEventsBasedEntity::UnserializeFrom(project, element);
+  UnserializeObjectsFrom(project, element.GetChild("objects"));
+}
+
+}  // namespace gd
--- a/Core/GDCore/Project/EventsBasedObject.h
+++ b/Core/GDCore/Project/EventsBasedObject.h
@@ -0,0 +1,86 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_EVENTSBASEDOBJECT_H
+#define GDCORE_EVENTSBASEDOBJECT_H
+
+#include <vector>
+#include "GDCore/Project/AbstractEventsBasedEntity.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+class Project;
+}  // namespace gd
+
+namespace gd {
+// TODO EBO Add a way to mark some parts of children configuration as readonly.
+/**
+ * \brief Represents an object that is implemented with events.
+ *
+ * It's the responsibility of the IDE to run the logic to transform this into a
+ * real object, by declaring an extension and running code generation.
+ * See `EventsFunctionsExtensionsLoader`.
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public ObjectsContainer {
+ public:
+  EventsBasedObject();
+  virtual ~EventsBasedObject();
+  EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject);
+
+  /**
+   * \brief Return a pointer to a new EventsBasedObject constructed from
+   * this one.
+   */
+  EventsBasedObject* Clone() const { return new EventsBasedObject(*this); };
+
+  /**
+   * \brief Get the default name for created objects.
+   */
+  const gd::String& GetDefaultName() const { return defaultName; };
+
+  /**
+   * \brief Set the default name for created objects.
+   */
+  EventsBasedObject& SetDefaultName(const gd::String& defaultName_) {
+    defaultName = defaultName_;
+    return *this;
+  }
+
+  EventsBasedObject& SetDescription(const gd::String& description_) override {
+    AbstractEventsBasedEntity::SetDescription(description_);
+    return *this;
+  }
+
+  /**
+   * \brief Set the internal name of the object.
+   */
+  EventsBasedObject& SetName(const gd::String& name_) {
+    AbstractEventsBasedEntity::SetName(name_);
+    return *this;
+  }
+
+  /**
+   * \brief Set the name of the object, to be displayed in the editor.
+   */
+  EventsBasedObject& SetFullName(const gd::String& fullName_) {
+    AbstractEventsBasedEntity::SetFullName(fullName_);
+    return *this;
+  }
+
+  void SerializeTo(SerializerElement& element) const override;
+
+  void UnserializeFrom(gd::Project& project,
+                       const SerializerElement& element) override;
+
+ private:
+  gd::String defaultName;
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_EVENTSBASEDOBJECT_H
--- a/Core/GDCore/Project/EventsFunctionsExtension.cpp
+++ b/Core/GDCore/Project/EventsFunctionsExtension.cpp
@@ -6,6 +6,7 @@
 #include "EventsFunctionsExtension.h"

 #include "EventsBasedBehavior.h"
+#include "EventsBasedObject.h"
 #include "EventsFunction.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/MakeUnique.h"
@@ -42,6 +43,7 @@ void EventsFunctionsExtension::Init(const gd::EventsFunctionsExtension& other) {
  helpPath = other.helpPath;
  EventsFunctionsContainer::Init(other);
  eventsBasedBehaviors = other.eventsBasedBehaviors;
+  eventsBasedObjects = other.eventsBasedObjects;
 }

 void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
@@ -79,9 +81,17 @@ void EventsFunctionsExtension::SerializeTo(SerializerElement& element) const {
  SerializeEventsFunctionsTo(element.AddChild("eventsFunctions"));
  eventsBasedBehaviors.SerializeElementsTo(
      "eventsBasedBehavior", element.AddChild("eventsBasedBehaviors"));
+  eventsBasedObjects.SerializeElementsTo(
+      "eventsBasedObject", element.AddChild("eventsBasedObjects"));
 }

 void EventsFunctionsExtension::UnserializeFrom(
+    gd::Project& project, const SerializerElement& element) {
+      UnserializeExtensionDeclarationFrom(project, element);
+      UnserializeExtensionImplementationFrom(project, element);
+}
+
+void EventsFunctionsExtension::UnserializeExtensionDeclarationFrom(
    gd::Project& project, const SerializerElement& element) {
  version = element.GetStringAttribute("version");
  extensionNamespace = element.GetStringAttribute("extensionNamespace");
@@ -134,9 +144,34 @@ void EventsFunctionsExtension::UnserializeFrom(
    dependencies.push_back(
        UnserializeDependencyFrom(dependenciesElement.GetChild(i)));

+  // Only unserialize behaviors and objects names.
+  // As event based objects can contains objects using CustomBehavior and/or
+  // CustomObject, this allows them to reference EventBasedBehavior and
+  // EventBasedObject respectively.
+  auto &behaviorsElement = element.GetChild("eventsBasedBehaviors");
+  behaviorsElement.ConsiderAsArrayOf("eventsBasedBehavior");
+  for (std::size_t i = 0; i < behaviorsElement.GetChildrenCount(); ++i) {
+    const gd::String &behaviorName =
+        behaviorsElement.GetChild(i).GetStringAttribute("name");
+    eventsBasedBehaviors.InsertNew(behaviorName, eventsBasedBehaviors.GetCount());
+  }
+  auto &objectsElement = element.GetChild("eventsBasedObjects");
+  objectsElement.ConsiderAsArrayOf("eventsBasedObject");
+  for (std::size_t i = 0; i < objectsElement.GetChildrenCount(); ++i) {
+    const gd::String &objectName =
+        objectsElement.GetChild(i).GetStringAttribute("name");
+    eventsBasedObjects.InsertNew(objectName, eventsBasedObjects.GetCount());
+  }
+}
+
+void EventsFunctionsExtension::UnserializeExtensionImplementationFrom(
+    gd::Project& project,
+    const SerializerElement& element) {
  UnserializeEventsFunctionsFrom(project, element.GetChild("eventsFunctions"));
  eventsBasedBehaviors.UnserializeElementsFrom(
      "eventsBasedBehavior", project, element.GetChild("eventsBasedBehaviors"));
+  eventsBasedObjects.UnserializeElementsFrom(
+      "eventsBasedObject", project, element.GetChild("eventsBasedObjects"));
 }

 bool EventsFunctionsExtension::IsExtensionLifecycleEventsFunction(
--- a/Core/GDCore/Project/EventsFunctionsExtension.h
+++ b/Core/GDCore/Project/EventsFunctionsExtension.h
@@ -10,6 +10,7 @@

 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
 #include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsContainer.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/SerializableWithNameList.h"
@@ -145,6 +146,21 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
    return eventsBasedBehaviors;
  }

+  /**
+   * \brief Return a reference to the list of the events based objects.
+   */
+  gd::SerializableWithNameList<EventsBasedObject>& GetEventsBasedObjects() {
+    return eventsBasedObjects;
+  }
+
+  /**
+   * \brief Return a const reference to the list of the events based objects.
+   */
+  const gd::SerializableWithNameList<EventsBasedObject>&
+  GetEventsBasedObjects() const {
+    return eventsBasedObjects;
+  }
+
  /**
   * \brief Sets an extension origin. This method is not present since the
   * beginning so the projects created before that will have extensions
@@ -200,10 +216,26 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
  void SerializeTo(gd::SerializerElement& element) const;

  /**
-   * \brief Load the EventsFunctionsExtension from the specified element
+   * \brief Load the EventsFunctionsExtension from the specified element.
   */
  void UnserializeFrom(gd::Project& project,
                       const gd::SerializerElement& element);
+
+  /**
+   * \brief Load the extension without free functions, behaviors and objects
+   * implementation.
+   */
+  void UnserializeExtensionDeclarationFrom(
+      gd::Project& project,
+      const gd::SerializerElement& element);
+
+  /**
+   * \brief Load free functions, behaviors and objects implementation
+   * (in opposition to load just their "declaration" by reading their name).
+   */
+  void UnserializeExtensionImplementationFrom(
+      gd::Project& project,
+      const gd::SerializerElement& element);
  ///@}

  /** \name Lifecycle event functions
@@ -255,6 +287,7 @@ class GD_CORE_API EventsFunctionsExtension : public EventsFunctionsContainer {
  gd::String helpPath;  ///< The relative path to the help for this extension in
                        ///< the documentation (or an absolute URL).
  gd::SerializableWithNameList<EventsBasedBehavior> eventsBasedBehaviors;
+  gd::SerializableWithNameList<EventsBasedObject> eventsBasedObjects;
  std::vector<gd::DependencyMetadata> dependencies;
 };

--- a/Core/GDCore/Project/InitialInstance.cpp
+++ b/Core/GDCore/Project/InitialInstance.cpp
@@ -11,9 +11,7 @@
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/UUID/UUID.h"
-#if defined(GD_IDE_ONLY)
 #include "GDCore/Project/PropertyDescriptor.h"
-#endif

 namespace gd {

@@ -30,6 +28,7 @@ InitialInstance::InitialInstance()
      width(0),
      height(0),
      locked(false),
+      sealed(false),
      persistentUuid(UUID::MakeUuid4()) {}

 void InitialInstance::UnserializeFrom(const SerializerElement& element) {
@@ -44,6 +43,7 @@ void InitialInstance::UnserializeFrom(const SerializerElement& element) {
  SetZOrder(element.GetIntAttribute("zOrder", 0, "plan"));
  SetLayer(element.GetStringAttribute("layer"));
  SetLocked(element.GetBoolAttribute("locked", false));
+  SetSealed(element.GetBoolAttribute("sealed", false));

  persistentUuid = element.GetStringAttribute("persistentUuid");
  if (persistentUuid.empty()) ResetPersistentUuid();
@@ -83,7 +83,8 @@ void InitialInstance::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("customSize", HasCustomSize());
  element.SetAttribute("width", GetCustomWidth());
  element.SetAttribute("height", GetCustomHeight());
-  element.SetAttribute("locked", IsLocked());
+  if (IsLocked()) element.SetAttribute("locked", IsLocked());
+  if (IsSealed()) element.SetAttribute("sealed", IsSealed());

  if (persistentUuid.empty()) persistentUuid = UUID::MakeUuid4();
  element.SetStringAttribute("persistentUuid", persistentUuid);
@@ -112,15 +113,14 @@ InitialInstance& InitialInstance::ResetPersistentUuid() {
  return *this;
 }

-#if defined(GD_IDE_ONLY)
 std::map<gd::String, gd::PropertyDescriptor>
 InitialInstance::GetCustomProperties(gd::Project& project, gd::Layout& layout) {
  // Find an object
  if (layout.HasObjectNamed(GetObjectName()))
-    return layout.GetObject(GetObjectName())
+    return layout.GetObject(GetObjectName()).GetConfiguration()
        .GetInitialInstanceProperties(*this, project, layout);
  else if (project.HasObjectNamed(GetObjectName()))
-    return project.GetObject(GetObjectName())
+    return project.GetObject(GetObjectName()).GetConfiguration()
        .GetInitialInstanceProperties(*this, project, layout);

  std::map<gd::String, gd::PropertyDescriptor> nothing;
@@ -132,15 +132,14 @@ bool InitialInstance::UpdateCustomProperty(const gd::String& name,
                                           gd::Project& project,
                                           gd::Layout& layout) {
  if (layout.HasObjectNamed(GetObjectName()))
-    return layout.GetObject(GetObjectName())
+    return layout.GetObject(GetObjectName()).GetConfiguration()
        .UpdateInitialInstanceProperty(*this, name, value, project, layout);
  else if (project.HasObjectNamed(GetObjectName()))
-    return project.GetObject(GetObjectName())
+    return project.GetObject(GetObjectName()).GetConfiguration()
        .UpdateInitialInstanceProperty(*this, name, value, project, layout);

  return false;
 }
-#endif

 double InitialInstance::GetRawDoubleProperty(const gd::String& name) const {
  const auto& it = numberProperties.find(name);
--- a/Core/GDCore/Project/InitialInstance.h
+++ b/Core/GDCore/Project/InitialInstance.h
@@ -127,19 +127,31 @@ class GD_CORE_API InitialInstance {
  void SetCustomHeight(double height_) { height = height_; }

  /**
-   * \brief Return true if the instance is locked and cannot be selected by
-   * clicking on it in the IDE.
+   * \brief Return true if the instance is locked and cannot be moved in the IDE.
   */
  bool IsLocked() const { return locked; };

  /**
   * \brief (Un)lock the initial instance.
   *
-   * An instance which is locked cannot be selected by clicking on it in a
-   * layout editor canvas.
+   * An instance which is locked cannot be moved with actions in the IDE.
   */
  void SetLocked(bool enable = true) { locked = enable; }

+  /**
+   * \brief Return true if the instance cannot be selected by clicking on it
+   * in the IDE (only applies if instance is also locked).
+   */
+  bool IsSealed() const { return sealed; };
+
+  /**
+   * \brief (Un)seal the initial instance.
+   *
+   * An instance which is sealed cannot be selected by clicking on it in a
+   * layout editor canvas.
+   */
+  void SetSealed(bool enable = true) { sealed = enable; }
+
  ///@}

  /** \name Variable management
@@ -270,6 +282,7 @@ class GD_CORE_API InitialInstance {
  double height;           ///< Object custom height
  gd::VariablesContainer initialVariables;  ///< Instance specific variables
  bool locked;                              ///< True if the instance is locked
+  bool sealed;                              ///< True if the instance is sealed
  mutable gd::String persistentUuid; ///< A persistent random version 4 UUID, useful for hot reloading.

  static gd::String*
--- a/Core/GDCore/Project/InitialInstancesContainer.h
+++ b/Core/GDCore/Project/InitialInstancesContainer.h
@@ -244,6 +244,15 @@ class GD_CORE_API HighestZOrderFinder : public gd::InitialInstanceFunctor {
   */
  size_t GetInstancesCount() const { return instancesCount; }

+  void Reset() {
+    highestZOrder = 0;
+    lowestZOrder = 0;
+    instancesCount = 0;
+    firstCall = true;
+    layerRestricted = false;
+    layerName.clear();
+  }
+
 private:
  int highestZOrder;
  int lowestZOrder;
--- a/Core/GDCore/Project/Layout.cpp
+++ b/Core/GDCore/Project/Layout.cpp
@@ -16,7 +16,6 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/IDE/SceneNameMangler.h"
 #include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/BehaviorContent.h"
 #include "GDCore/Project/BehaviorsSharedData.h"
 #include "GDCore/Project/InitialInstance.h"
 #include "GDCore/Project/Layer.h"
@@ -33,7 +32,7 @@ using namespace std;
 namespace gd {

 gd::Layer Layout::badLayer;
-gd::BehaviorContent Layout::badBehaviorContent("", "");
+gd::BehaviorsSharedData Layout::badBehaviorSharedData("", "");

 Layout::Layout(const Layout& other) { Init(other); }

@@ -51,9 +50,6 @@ Layout::Layout()
      backgroundColorB(209),
      stopSoundsOnStartup(true),
      standardSortMethod(true),
-      oglFOV(90.0f),
-      oglZNear(1.0f),
-      oglZFar(500.0f),
      disableInputWhenNotFocused(true),
      profiler(NULL)
 {
@@ -79,23 +75,23 @@ std::vector<gd::String> Layout::GetAllBehaviorSharedDataNames() const {
  return allNames;
 }

-const gd::BehaviorContent& Layout::GetBehaviorSharedData(
+const gd::BehaviorsSharedData& Layout::GetBehaviorSharedData(
    const gd::String& behaviorName) const {
  auto it = behaviorsSharedData.find(behaviorName);
  if (it != behaviorsSharedData.end()) return *it->second;

-  return badBehaviorContent;
+  return badBehaviorSharedData;
 }

-gd::BehaviorContent& Layout::GetBehaviorSharedData(
+gd::BehaviorsSharedData& Layout::GetBehaviorSharedData(
    const gd::String& behaviorName) {
  auto it = behaviorsSharedData.find(behaviorName);
  if (it != behaviorsSharedData.end()) return *it->second;

-  return badBehaviorContent;
+  return badBehaviorSharedData;
 }

-const std::map<gd::String, std::unique_ptr<gd::BehaviorContent> >&
+const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData> >&
 Layout::GetAllBehaviorSharedData() const {
  return behaviorsSharedData;
 }
@@ -197,20 +193,20 @@ void Layout::UpdateBehaviorsSharedData(gd::Project& project) {
    std::vector<gd::String> objectBehaviors =
        initialObjects[i]->GetAllBehaviorNames();
    for (unsigned int j = 0; j < objectBehaviors.size(); ++j) {
-      auto& behaviorContent =
+      auto& behavior =
          initialObjects[i]->GetBehavior(objectBehaviors[j]);
-      allBehaviorsTypes.push_back(behaviorContent.GetTypeName());
-      allBehaviorsNames.push_back(behaviorContent.GetName());
+      allBehaviorsTypes.push_back(behavior.GetTypeName());
+      allBehaviorsNames.push_back(behavior.GetName());
    }
  }
  for (std::size_t i = 0; i < project.GetObjectsCount(); ++i) {
    std::vector<gd::String> objectBehaviors =
        project.GetObject(i).GetAllBehaviorNames();
    for (std::size_t j = 0; j < objectBehaviors.size(); ++j) {
-      auto& behaviorContent =
+      auto& behavior =
          project.GetObject(i).GetBehavior(objectBehaviors[j]);
-      allBehaviorsTypes.push_back(behaviorContent.GetTypeName());
-      allBehaviorsNames.push_back(behaviorContent.GetName());
+      allBehaviorsTypes.push_back(behavior.GetTypeName());
+      allBehaviorsNames.push_back(behavior.GetName());
    }
  }

@@ -222,19 +218,10 @@ void Layout::UpdateBehaviorsSharedData(gd::Project& project) {

    if (behaviorsSharedData.find(name) != behaviorsSharedData.end()) continue;

-    const gd::BehaviorMetadata& behaviorMetadata =
-        gd::MetadataProvider::GetBehaviorMetadata(project.GetCurrentPlatform(),
-                                                  allBehaviorsTypes[i]);
-    if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) continue;
-
-    gd::BehaviorsSharedData* behaviorSharedData =
-        behaviorMetadata.GetSharedDataInstance();
-    if (!behaviorSharedData) continue;
-
-    auto behaviorContent =
-        gd::make_unique<gd::BehaviorContent>(name, allBehaviorsTypes[i]);
-    behaviorSharedData->InitializeContent(behaviorContent->GetContent());
-    behaviorsSharedData[name] = std::move(behaviorContent);
+    auto sharedData = CreateBehaviorsSharedData(project, name, allBehaviorsTypes[i]);
+    if (sharedData) {
+      behaviorsSharedData[name] = std::move(sharedData);
+    }
  }

  // Remove useless shared data:
@@ -253,6 +240,33 @@ void Layout::UpdateBehaviorsSharedData(gd::Project& project) {
  }
 }

+std::unique_ptr<gd::BehaviorsSharedData> Layout::CreateBehaviorsSharedData(gd::Project& project, const gd::String& name, const gd::String& behaviorsType) {
+    if (project.HasEventsBasedBehavior(behaviorsType)) {
+      // Events based behaviors don't have shared data yet.
+      auto sharedData =
+          gd::make_unique<gd::BehaviorsSharedData>(name, behaviorsType);
+      sharedData->InitializeContent();
+      return std::move(sharedData);
+    }
+    const gd::BehaviorMetadata& behaviorMetadata =
+        gd::MetadataProvider::GetBehaviorMetadata(
+            project.GetCurrentPlatform(),
+            behaviorsType);
+    if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
+      return nullptr;
+    }
+
+    gd::BehaviorsSharedData* behaviorsSharedDataBluePrint =
+        behaviorMetadata.GetSharedDataInstance();
+    if (!behaviorsSharedDataBluePrint) return nullptr;
+
+    auto sharedData = behaviorsSharedDataBluePrint->Clone();
+    sharedData->SetName(name);
+    sharedData->SetTypeName(behaviorsType);
+    sharedData->InitializeContent();
+    return std::unique_ptr<gd::BehaviorsSharedData>(sharedData);
+}
+
 void Layout::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("name", GetName());
  element.SetAttribute("mangledName", GetMangledName());
@@ -260,17 +274,12 @@ void Layout::SerializeTo(SerializerElement& element) const {
  element.SetAttribute("v", (int)GetBackgroundColorGreen());
  element.SetAttribute("b", (int)GetBackgroundColorBlue());
  element.SetAttribute("title", GetWindowDefaultTitle());
-  element.SetAttribute("oglFOV", oglFOV);
-  element.SetAttribute("oglZNear", oglZNear);
-  element.SetAttribute("oglZFar", oglZFar);
  element.SetAttribute("standardSortMethod", standardSortMethod);
  element.SetAttribute("stopSoundsOnStartup", stopSoundsOnStartup);
  element.SetAttribute("disableInputWhenNotFocused",
                       disableInputWhenNotFocused);

-#if defined(GD_IDE_ONLY)
  editorSettings.SerializeTo(element.AddChild("uiSettings"));
-#endif

  GetObjectGroups().SerializeTo(element.AddChild("objectsGroups"));
  GetVariables().SerializeTo(element.AddChild("variables"));
@@ -321,9 +330,6 @@ void Layout::UnserializeFrom(gd::Project& project,
                     element.GetIntAttribute("b"));
  SetWindowDefaultTitle(
      element.GetStringAttribute("title", "(No title)", "titre"));
-  oglFOV = element.GetDoubleAttribute("oglFOV");
-  oglZNear = element.GetDoubleAttribute("oglZNear");
-  oglZFar = element.GetDoubleAttribute("oglZFar");
  standardSortMethod = element.GetBoolAttribute("standardSortMethod");
  stopSoundsOnStartup = element.GetBoolAttribute("stopSoundsOnStartup");
  disableInputWhenNotFocused =
@@ -364,20 +370,23 @@ void Layout::UnserializeFrom(gd::Project& project,
                            "Behavior");  // Compatibility with GD <= 4
    gd::String name = sharedDataElement.GetStringAttribute("name", "", "Name");

-    auto behaviorContent = gd::make_unique<gd::BehaviorContent>(name, type);
-    // Compatibility with GD <= 4.0.98
-    // If there is only one child called "content" (in addition to "type" and
-    // "name"), it's the content of a JavaScript behavior. Move the content
-    // out of the "content" object (to put it directly at the root of the
-    // behavior shared data element).
-    if (sharedDataElement.HasChild("content")) {
-      behaviorContent->UnserializeFrom(sharedDataElement.GetChild("content"));
+
+    auto sharedData = CreateBehaviorsSharedData(project, name, type);
+    if (sharedData) {
+      // Compatibility with GD <= 4.0.98
+      // If there is only one child called "content" (in addition to "type" and
+      // "name"), it's the content of a JavaScript behavior. Move the content
+      // out of the "content" object (to put it directly at the root of the
+      // behavior shared data element).
+      if (sharedDataElement.HasChild("content")) {
+        sharedData->UnserializeFrom(sharedDataElement.GetChild("content"));
+      }
+      // end of compatibility code
+      else {
+        sharedData->UnserializeFrom(sharedDataElement);
+      }
+      behaviorsSharedData[name] = std::move(sharedData);
    }
-    // end of compatibility code
-    else {
-      behaviorContent->UnserializeFrom(sharedDataElement);
-    }
-    behaviorsSharedData[name] = std::move(behaviorContent);
  }
 }

@@ -388,9 +397,6 @@ void Layout::Init(const Layout& other) {
  backgroundColorB = other.backgroundColorB;
  standardSortMethod = other.standardSortMethod;
  title = other.title;
-  oglFOV = other.oglFOV;
-  oglZNear = other.oglZNear;
-  oglZFar = other.oglZFar;
  stopSoundsOnStartup = other.stopSoundsOnStartup;
  disableInputWhenNotFocused = other.disableInputWhenNotFocused;
  initialInstances = other.initialInstances;
@@ -402,7 +408,7 @@ void Layout::Init(const Layout& other) {
  behaviorsSharedData.clear();
  for (const auto& it : other.behaviorsSharedData) {
    behaviorsSharedData[it.first] =
-        std::unique_ptr<gd::BehaviorContent>(it.second->Clone());
+        std::unique_ptr<gd::BehaviorsSharedData>(it.second->Clone());
  }

  events = other.events;
--- a/Core/GDCore/Project/Layout.h
+++ b/Core/GDCore/Project/Layout.h
@@ -17,14 +17,12 @@
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
-#if defined(GD_IDE_ONLY)
 #include "GDCore/IDE/Dialogs/LayoutEditorCanvas/EditorSettings.h"
-#endif
+
 namespace gd {
 class BaseEvent;
 class Object;
 class Project;
-class BehaviorContent;
 class InitialInstancesContainer;
 }  // namespace gd
 class TiXmlElement;
@@ -131,7 +129,6 @@ class GD_CORE_API Layout : public ObjectsContainer {
   */
  ///@{

-#if defined(GD_IDE_ONLY)
  /**
   * Get the events of the layout
   */
@@ -141,7 +138,7 @@ class GD_CORE_API Layout : public ObjectsContainer {
   * Get the events of the layout
   */
  gd::EventsList& GetEvents() { return events; }
-#endif
+
  ///@}

  /** \name Variable management
@@ -238,12 +235,10 @@ class GD_CORE_API Layout : public ObjectsContainer {
   */
  void MoveLayer(std::size_t oldIndex, std::size_t newIndex);

-#if defined(GD_IDE_ONLY)
  /**
   * \brief Serialize the layers.
   */
  void SerializeLayersTo(SerializerElement& element) const;
-#endif

  /**
   * \brief Unserialize the layers.
@@ -274,21 +269,21 @@ class GD_CORE_API Layout : public ObjectsContainer {
  /**
   * \brief Get the shared data stored for a behavior
   */
-  const gd::BehaviorContent& GetBehaviorSharedData(
+  const gd::BehaviorsSharedData& GetBehaviorSharedData(
      const gd::String& behaviorName) const;

  /**
   * \brief Get the shared data stored for a behavior
   */
-  gd::BehaviorContent& GetBehaviorSharedData(const gd::String& behaviorName);
+  gd::BehaviorsSharedData& GetBehaviorSharedData(const gd::String& behaviorName);

  /**
   * \brief Get a map of all shared data stored for behaviors
   */
-  const std::map<gd::String, std::unique_ptr<gd::BehaviorContent>>&
+  const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>&
  GetAllBehaviorSharedData() const;

-#if defined(GD_IDE_ONLY)
+
  /**
   * Return the settings associated to the layout.
   * \see gd::EditorSettings
@@ -304,7 +299,6 @@ class GD_CORE_API Layout : public ObjectsContainer {
  gd::EditorSettings& GetAssociatedEditorSettings() {
    return editorSettings;
  }
-#endif

  /** \name Other properties
   */
@@ -345,48 +339,16 @@ class GD_CORE_API Layout : public ObjectsContainer {
   * launched
   */
  bool StopSoundsOnStartup() const { return stopSoundsOnStartup; }
-
-  /**
-   * Set OpenGL default field of view
-   */
-  void SetOpenGLFOV(float oglFOV_) { oglFOV = oglFOV_; }
-
-  /**
-   * Get OpenGL default field of view
-   */
-  float GetOpenGLFOV() const { return oglFOV; }
-
-  /**
-   * Set OpenGL near clipping plan
-   */
-  void SetOpenGLZNear(float oglZNear_) { oglZNear = oglZNear_; }
-
-  /**
-   * Get OpenGL near clipping plan
-   */
-  float GetOpenGLZNear() const { return oglZNear; }
-
-  /**
-   * Set OpenGL far clipping plan
-   */
-  void SetOpenGLZFar(float oglZFar_) { oglZFar = oglZFar_; }
-
-  /**
-   * Get OpenGL far clipping plan
-   */
-  float GetOpenGLZFar() const { return oglZFar; }
 ///@}

 /** \name Saving and loading
 * Members functions related to saving and loading the object.
 */
 ///@{
-#if defined(GD_IDE_ONLY)
  /**
   * \brief Serialize the layout.
   */
  void SerializeTo(SerializerElement& element) const;
-#endif

  /**
   * \brief Unserialize the layout.
@@ -395,7 +357,6 @@ class GD_CORE_API Layout : public ObjectsContainer {
 ///@}

 // TODO: GD C++ Platform specific code below
-#if defined(GD_IDE_ONLY)
  /**
   * Get the profiler associated with the scene. Can be NULL.
   */
@@ -405,7 +366,6 @@ class GD_CORE_API Layout : public ObjectsContainer {
   * Set the profiler associated with the scene. Can be NULL.
   */
  void SetProfiler(BaseProfiler* profiler_) { profiler = profiler_; };
-#endif

 private:
  gd::String name;         ///< Scene name
@@ -417,38 +377,38 @@ class GD_CORE_API Layout : public ObjectsContainer {
  gd::VariablesContainer variables;  ///< Variables list
  gd::InitialInstancesContainer initialInstances;  ///< Initial instances
  std::vector<gd::Layer> initialLayers;            ///< Initial layers
-  std::map<gd::String, std::unique_ptr<gd::BehaviorContent>>
+  std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>
      behaviorsSharedData;   ///< Initial shared datas of behaviors
  bool stopSoundsOnStartup;  ///< True to make the scene stop all sounds at
                             ///< startup.
  bool standardSortMethod;   ///< True to sort objects using standard sort.
-  float oglFOV;              ///< OpenGL Field Of View value
-  float oglZNear;            ///< OpenGL Near Z position
-  float oglZFar;             ///< OpenGL Far Z position
  bool disableInputWhenNotFocused;  /// If set to true, the input must be
                                    /// disabled when the window do not have the
                                    /// focus.
  static gd::Layer badLayer;  ///< Null object, returned when GetLayer can not
                              ///< find an appropriate layer.
-  static gd::BehaviorContent
-      badBehaviorContent;  ///< Null object, returned when
+  static gd::BehaviorsSharedData
+      badBehaviorSharedData;  ///< Null object, returned when
                           ///< GetBehaviorSharedData can not find the
                           ///< specified behavior shared data.
-#if defined(GD_IDE_ONLY)
+
  EventsList events;  ///< Scene events
  gd::EditorSettings editorSettings;
-#endif

 // TODO: GD C++ Platform specific code below
-#if defined(GD_IDE_ONLY)
+
  BaseProfiler* profiler;  ///< Pointer to the profiler. Can be NULL.
-#endif

  /**
   * Initialize from another layout. Used by copy-ctor and assign-op.
   * Don't forget to update me if members were changed!
   */
  void Init(const gd::Layout& other);
+
+  std::unique_ptr<gd::BehaviorsSharedData> CreateBehaviorsSharedData(
+      gd::Project& project,
+      const gd::String& name,
+      const gd::String& behaviorsType);
 };

 /**
--- a/Core/GDCore/Project/Object.cpp
+++ b/Core/GDCore/Project/Object.cpp
@@ -9,29 +9,52 @@
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/CustomBehavior.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Tools/Log.h"

 namespace gd {

 Object::~Object() {}

-Object::Object(const gd::String& name_) : name(name_) {}
+Object::Object(const gd::String& name_,
+               const gd::String& type_,
+               std::unique_ptr<gd::ObjectConfiguration> configuration_)
+    : name(name_), configuration(std::move(configuration_)) {
+      SetType(type_);
+    }
+
+Object::Object(const gd::String& name_,
+               const gd::String& type_,
+               gd::ObjectConfiguration* configuration_)
+    : name(name_), configuration(configuration_) {
+      SetType(type_);
+    }

 void Object::Init(const gd::Object& object) {
  name = object.name;
  assetStoreId = object.assetStoreId;
-  type = object.type;
  objectVariables = object.objectVariables;
  tags = object.tags;
  effectsContainer = object.effectsContainer;

  behaviors.clear();
  for (auto& it : object.behaviors) {
-    behaviors[it.first] = gd::make_unique<gd::BehaviorContent>(*it.second);
+    behaviors[it.first] = gd::make_unique<gd::Behavior>(*it.second);
  }
+
+  configuration = object.configuration->Clone();
+}
+
+gd::ObjectConfiguration& Object::GetConfiguration() {
+  return *configuration;
+}
+
+const gd::ObjectConfiguration& Object::GetConfiguration() const {
+  return *configuration;
 }

 std::vector<gd::String> Object::GetAllBehaviorNames() const {
@@ -49,7 +72,7 @@ bool Object::RenameBehavior(const gd::String& name, const gd::String& newName) {
      behaviors.find(newName) != behaviors.end())
    return false;

-  std::unique_ptr<BehaviorContent> aut =
+  std::unique_ptr<Behavior> aut =
      std::move(behaviors.find(name)->second);
  behaviors.erase(name);
  behaviors[newName] = std::move(aut);
@@ -58,11 +81,11 @@ bool Object::RenameBehavior(const gd::String& name, const gd::String& newName) {
  return true;
 }

-gd::BehaviorContent& Object::GetBehavior(const gd::String& name) {
+gd::Behavior& Object::GetBehavior(const gd::String& name) {
  return *behaviors.find(name)->second;
 }

-const gd::BehaviorContent& Object::GetBehavior(const gd::String& name) const {
+const gd::Behavior& Object::GetBehavior(const gd::String& name) const {
  return *behaviors.find(name)->second;
 }

@@ -70,47 +93,41 @@ bool Object::HasBehaviorNamed(const gd::String& name) const {
  return behaviors.find(name) != behaviors.end();
 }

-gd::BehaviorContent& Object::AddBehavior(
-    const gd::BehaviorContent& behaviorContent) {
-  const gd::String& behaviorName = behaviorContent.GetName();
-  auto newBehaviorContent =
-      gd::make_unique<gd::BehaviorContent>(behaviorContent);
-  behaviors[behaviorName] = std::move(newBehaviorContent);
-  return *behaviors[behaviorName];
-}
-
-std::map<gd::String, gd::PropertyDescriptor> Object::GetProperties() const {
-  std::map<gd::String, gd::PropertyDescriptor> nothing;
-  return nothing;
-}
-
-gd::BehaviorContent* Object::AddNewBehavior(const gd::Project& project,
+gd::Behavior* Object::AddNewBehavior(const gd::Project& project,
                                            const gd::String& type,
                                            const gd::String& name) {
-  const gd::BehaviorMetadata& behaviorMetadata =
-      gd::MetadataProvider::GetBehaviorMetadata(project.GetCurrentPlatform(),
-                                                type);
-  if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
-    return nullptr;
+  auto initializeAndAdd =
+      [this, &name](std::unique_ptr<gd::Behavior> behavior) {
+    behavior->InitializeContent();
+    this->behaviors[name] = std::move(behavior);
+    return this->behaviors[name].get();
+  };
+
+  if (project.HasEventsBasedBehavior(type)) {
+    return initializeAndAdd(
+        gd::make_unique<CustomBehavior>(name, project, type));
+  }
+  else {
+    const gd::BehaviorMetadata& behaviorMetadata =
+        gd::MetadataProvider::GetBehaviorMetadata(project.GetCurrentPlatform(),
+                                                  type);
+    if (gd::MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
+      gd::LogWarning("Tried to create a behavior with an unknown type: " + type
+                     + " on object " + GetName() + "!");
+    // It's probably an events-based object that was removed.
+    // Create a custom behavior to preserve the properties values.
+    return initializeAndAdd(
+        gd::make_unique<CustomBehavior>(name, project, type));
+    }
+    std::unique_ptr<gd::Behavior> behavior(behaviorMetadata.Get().Clone());
+    behavior->SetName(name);
+    return initializeAndAdd(std::move(behavior));
  }
-
-  auto behaviorContent = gd::make_unique<gd::BehaviorContent>(name, type);
-  behaviorMetadata.Get().InitializeContent(behaviorContent->GetContent());
-  behaviors[name] = std::move(behaviorContent);
-  return behaviors[name].get();
-}
-
-std::map<gd::String, gd::PropertyDescriptor>
-Object::GetInitialInstanceProperties(const gd::InitialInstance& instance,
-                                     gd::Project& project,
-                                     gd::Layout& layout) {
-  std::map<gd::String, gd::PropertyDescriptor> nothing;
-  return nothing;
 }

 void Object::UnserializeFrom(gd::Project& project,
                             const SerializerElement& element) {
-  type = element.GetStringAttribute("type");
+  SetType(element.GetStringAttribute("type"));
  assetStoreId = element.GetStringAttribute("assetStoreId");
  name = element.GetStringAttribute("name", name, "nom");
  tags = element.GetStringAttribute("tags");
@@ -133,9 +150,8 @@ void Object::UnserializeFrom(gd::Project& project,
                            .FindAndReplace("Automatism", "Behavior");
      gd::String name = behaviorElement.GetStringAttribute("name", "", "Name");

-      auto behaviorContent = gd::make_unique<gd::BehaviorContent>(name, type);
-      behaviorContent->UnserializeFrom(behaviorElement);
-      behaviors[name] = std::move(behaviorContent);
+      auto behavior = gd::Object::AddNewBehavior(project, type, name);
+      behavior->UnserializeFrom(behaviorElement);
    }
  }
  // End of compatibility code
@@ -151,7 +167,7 @@ void Object::UnserializeFrom(gd::Project& project,
              "Automatism", "Behavior");  // Compatibility with GD <= 4
      gd::String name = behaviorElement.GetStringAttribute("name");

-      auto behaviorContent = gd::make_unique<gd::BehaviorContent>(name, type);
+      auto behavior = gd::Object::AddNewBehavior(project, type, name);
      // Compatibility with GD <= 4.0.98
      // If there is only one child called "content" (in addition to "type" and
      // "name"), it's the content of a JavaScript behavior. Move the content
@@ -169,17 +185,16 @@ void Object::UnserializeFrom(gd::Project& project,
          contentElement.RemoveChild("type");
        }

-        behaviorContent->UnserializeFrom(contentElement);
+        behavior->UnserializeFrom(contentElement);
      }
      // end of compatibility code
      else {
-        behaviorContent->UnserializeFrom(behaviorElement);
+        behavior->UnserializeFrom(behaviorElement);
      }
-      behaviors[name] = std::move(behaviorContent);
    }
  }

-  DoUnserializeFrom(project, element);
+  configuration->UnserializeFrom(project, element);
 }

 void Object::SerializeTo(SerializerElement& element) const {
@@ -194,18 +209,18 @@ void Object::SerializeTo(SerializerElement& element) const {
  behaviorsElement.ConsiderAsArrayOf("behavior");
  std::vector<gd::String> allBehaviors = GetAllBehaviorNames();
  for (std::size_t i = 0; i < allBehaviors.size(); ++i) {
-    const gd::BehaviorContent& behaviorContent = GetBehavior(allBehaviors[i]);
+    const gd::Behavior& behavior = GetBehavior(allBehaviors[i]);
    SerializerElement& behaviorElement = behaviorsElement.AddChild("behavior");

-    behaviorContent.SerializeTo(behaviorElement);
+    behavior.SerializeTo(behaviorElement);
    behaviorElement.RemoveChild("type");  // The content can contain type or
                                          // name properties, remove them.
    behaviorElement.RemoveChild("name");
-    behaviorElement.SetAttribute("type", behaviorContent.GetTypeName());
-    behaviorElement.SetAttribute("name", behaviorContent.GetName());
+    behaviorElement.SetAttribute("type", behavior.GetTypeName());
+    behaviorElement.SetAttribute("name", behavior.GetName());
  }

-  DoSerializeTo(element);
+  configuration->SerializeTo(element);
 }

 }  // namespace gd
--- a/Core/GDCore/Project/Object.h
+++ b/Core/GDCore/Project/Object.h
@@ -10,11 +10,13 @@
 #include <memory>
 #include <vector>

-#include "GDCore/Project/BehaviorContent.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Project/EffectsContainer.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/MakeUnique.h"
+
 namespace gd {
 class PropertyDescriptor;
 class Project;
@@ -28,7 +30,7 @@ class EffectsContainer;
 namespace gd {

 /**
- * \brief Base class used to represent an object of a platform
+ * \brief Represent an object of a platform
 *
 * \ingroup PlatformDefinition
 */
@@ -36,9 +38,19 @@ class GD_CORE_API Object {
 public:
  /**
   * Create a new object with the name passed as argument.
-   * \param name Object's name
   */
-  Object(const gd::String& name);
+  Object(const gd::String& name,
+         const gd::String& type,
+         std::unique_ptr<gd::ObjectConfiguration> configuration);
+
+  /**
+   * Create a new object with the name passed as argument.
+   * 
+   * Object takes the ownership of the configuration.
+   */
+  Object(const gd::String& name,
+         const gd::String& type,
+         gd::ObjectConfiguration* configuration);

  /**
   * Copy constructor. Calls Init().
@@ -70,6 +82,13 @@ class GD_CORE_API Object {
    return gd::make_unique<gd::Object>(*this);
  }

+  /**
+   * \brief Return the object configuration.
+   */
+  gd::ObjectConfiguration& GetConfiguration();
+
+  const gd::ObjectConfiguration& GetConfiguration() const;
+
  /** \name Common properties
   * Members functions related to common properties
   */
@@ -93,11 +112,15 @@ class GD_CORE_API Object {

  /** \brief Change the type of the object.
   */
-  void SetType(const gd::String& type_) { type = type_; }
+  void SetType(const gd::String& type_) {
+    configuration->SetType(type_);
+  }

  /** \brief Return the type of the object.
   */
-  const gd::String& GetType() const { return type; }
+  const gd::String& GetType() const {
+    return configuration->GetType();
+  }

  /** \brief Change the tags of the object.
   */
@@ -108,92 +131,6 @@ class GD_CORE_API Object {
  const gd::String& GetTags() const { return tags; }
  ///@}

-  /** \name Resources management
-   * Members functions related to managing resources used by the object
-   */
-  ///@{
-  /**
-   * \brief Called ( e.g. during compilation ) so as to inventory internal
-   * resources and sometimes update their filename. Implementation example:
-   * \code
-   * worker.ExposeImage(myImage);
-   * worker.ExposeFile(myResourceFile);
-   * \endcode
-   *
-   * \see ArbitraryResourceWorker
-   */
-  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker) { return; };
-
-  /**
-   * Redefine this function to return true if your object can use shaders.
-   */
-  virtual bool SupportShaders() { return false; }
-  ///@}
-
-  /** \name Object properties
-   * Reading and updating object properties
-   */
-  ///@{
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of the
-   object.
-   *
-   * Usage example:
-   \code
-      std::map<gd::String, gd::PropertyDescriptor> properties;
-      properties[ToString(_("Text"))].SetValue("Hello world!");
-
-      return properties;
-   \endcode
-   *
-   * \return a std::map with properties names as key.
-   * \see gd::PropertyDescriptor
-   */
-  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
-
-  /**
-   * \brief Called when the IDE wants to update a custom property of the object
-   *
-   * \return false if the new value cannot be set
-   */
-  virtual bool UpdateProperty(const gd::String& name, const gd::String& value) {
-    return false;
-  };
-  ///@}
-
-  /** \name Drawing and editing initial instances
-   * Members functions related to drawing and editing initial instances of this
-   * object
-   */
-  ///@{
-  /**
-   * \brief Called when the IDE wants to know about the custom properties of an
-   * initial instance of this object.
-   *
-   * \return a std::map with properties names as key and values.
-   * \see gd::InitialInstance
-   */
-  virtual std::map<gd::String, gd::PropertyDescriptor>
-  GetInitialInstanceProperties(const gd::InitialInstance& instance,
-                               gd::Project& project,
-                               gd::Layout& layout);
-
-  /**
-   * \brief Called when the IDE wants to update a custom property of an initial
-   * instance of this object.
-   *
-   * \return false if the new value cannot be set
-   * \see gd::InitialInstance
-   */
-  virtual bool UpdateInitialInstanceProperty(gd::InitialInstance& instance,
-                                             const gd::String& name,
-                                             const gd::String& value,
-                                             gd::Project& project,
-                                             gd::Layout& layout) {
-    return false;
-  };
-    ///@}
-
  /** \name Behaviors management
   * Members functions related to behaviors management.
   */
@@ -208,12 +145,12 @@ class GD_CORE_API Object {
  /**
   * \brief Return a reference to the content of the behavior called \a name.
   */
-  BehaviorContent& GetBehavior(const gd::String& name);
+  Behavior& GetBehavior(const gd::String& name);

  /**
   * \brief Return a reference to the content of the behavior called \a name.
   */
-  const BehaviorContent& GetBehavior(const gd::String& name) const;
+  const Behavior& GetBehavior(const gd::String& name) const;

  /**
   * \brief Return true if object has a behavior called \a name.
@@ -231,13 +168,6 @@ class GD_CORE_API Object {
   */
  bool RenameBehavior(const gd::String& name, const gd::String& newName);

-  /**
-   * \brief Add the specified behavior content to the object
-   *
-   * \return A reference to the newly added behavior content.
-   */
-  gd::BehaviorContent& AddBehavior(const gd::BehaviorContent& behavior);
-
  /**
   * \brief Add the behavior of the specified \a type with the specified \a
   * name.
@@ -247,15 +177,15 @@ class GD_CORE_API Object {
   * \return A pointer to the newly added behavior content. NULL if the creation
   * failed.
   */
-  gd::BehaviorContent* AddNewBehavior(const gd::Project& project,
-                                      const gd::String& type,
-                                      const gd::String& name);
+  gd::Behavior* AddNewBehavior(const gd::Project& project,
+                               const gd::String& type,
+                               const gd::String& name);

  /**
   * \brief Get a read-only access to the map containing the behaviors with
   * their properties.
   */
-  const std::map<gd::String, std::unique_ptr<gd::BehaviorContent>>&
+  const std::map<gd::String, std::unique_ptr<gd::Behavior>>&
  GetAllBehaviorContents() const {
    return behaviors;
  };
@@ -316,9 +246,8 @@ class GD_CORE_API Object {
 protected:
  gd::String name;  ///< The full name of the object
  gd::String assetStoreId;  ///< The ID of the asset if the object comes from the store.
-  gd::String type;  ///< Which type is the object. ( To test if we can do
-                    ///< something reserved to some objects with it )
-  std::map<gd::String, std::unique_ptr<gd::BehaviorContent>>
+  std::unique_ptr<gd::ObjectConfiguration> configuration;
+  std::map<gd::String, std::unique_ptr<gd::Behavior>>
      behaviors;  ///< Contains all behaviors and their properties for the
                  ///< object. Behavior contents are the ownership of the
                  ///< object.
@@ -328,20 +257,12 @@ class GD_CORE_API Object {
  gd::EffectsContainer
      effectsContainer;  ///< The effects container for the object.

-  /**
-   * \brief Derived objects can redefine this method to load custom attributes.
-   */
-  virtual void DoUnserializeFrom(gd::Project& project,
-                                 const SerializerElement& element){};
-
-  /**
-   * \brief Derived objects can redefine this method to save custom attributes.
-   */
-  virtual void DoSerializeTo(SerializerElement& element) const {};
-
  /**
   * Initialize object using another object. Used by copy-ctor and assign-op.
   * Don't forget to update me if members were changed!
+   * 
+   * It's needed because there is no default copy for a map of unique_ptr like
+   * behaviors and it must be a deep copy.
   */
  void Init(const gd::Object& object);
 };
--- a/Core/GDCore/Project/ObjectConfiguration.cpp
+++ b/Core/GDCore/Project/ObjectConfiguration.cpp
@@ -0,0 +1,47 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/Project/ObjectConfiguration.h"
+
+#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/CustomBehavior.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/Project/PropertyDescriptor.h"
+#include "GDCore/Tools/Log.h"
+
+namespace gd {
+
+ObjectConfiguration::~ObjectConfiguration() {}
+
+ObjectConfiguration::ObjectConfiguration() {}
+
+std::map<gd::String, gd::PropertyDescriptor> ObjectConfiguration::GetProperties() const {
+  std::map<gd::String, gd::PropertyDescriptor> nothing;
+  return nothing;
+}
+
+std::map<gd::String, gd::PropertyDescriptor>
+ObjectConfiguration::GetInitialInstanceProperties(const gd::InitialInstance& instance,
+                                     gd::Project& project,
+                                     gd::Layout& layout) {
+  std::map<gd::String, gd::PropertyDescriptor> nothing;
+  return nothing;
+}
+
+void ObjectConfiguration::UnserializeFrom(gd::Project& project,
+                             const SerializerElement& element) {
+  DoUnserializeFrom(project, element);
+}
+
+void ObjectConfiguration::SerializeTo(SerializerElement& element) const {
+  DoSerializeTo(element);
+}
+
+}  // namespace gd
--- a/Core/GDCore/Project/ObjectConfiguration.h
+++ b/Core/GDCore/Project/ObjectConfiguration.h
@@ -0,0 +1,194 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_OBJECTCONFIGURATION_H
+#define GDCORE_OBJECTCONFIGURATION_H
+#include "GDCore/Vector2.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/EffectsContainer.h"
+#include "GDCore/Project/VariablesContainer.h"
+#include "GDCore/String.h"
+#include "GDCore/Tools/MakeUnique.h"
+namespace gd {
+class PropertyDescriptor;
+class Project;
+class Layout;
+class ArbitraryResourceWorker;
+class InitialInstance;
+class SerializerElement;
+class EffectsContainer;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Base class used to represent an object configuration.
+ * For example, this can be the animations in a sprite, the text, its font,
+ * its color in a Text object, etc...
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API ObjectConfiguration {
+ public:
+  /**
+   * Create a new object configuration.
+   */
+  ObjectConfiguration();
+
+  /**
+   * Destructor.
+   */
+  virtual ~ObjectConfiguration();
+
+  /**
+   * Must return a pointer to a copy of the configuration. This method is
+   * needed to do polymorphic copies. Just redefine this method in your derived
+   * object class like this:
+   * \code
+   * return gd::make_unique<MyObjectConfiguration>(*this);
+   * \endcode
+   */
+  virtual std::unique_ptr<gd::ObjectConfiguration> Clone() const {
+    return gd::make_unique<gd::ObjectConfiguration>(*this);
+  }
+
+  /** \brief Change the type of the object.
+   */
+  void SetType(const gd::String& type_) { type = type_; }
+
+  /** \brief Return the type of the object.
+   */
+  const gd::String& GetType() const { return type; }
+
+  /** \name Object properties
+   * Reading and updating object configuration properties
+   */
+  ///@{
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of the
+   object configuration.
+   *
+   * Usage example:
+   \code
+      std::map<gd::String, gd::PropertyDescriptor> properties;
+      properties[ToString(_("Text"))].SetValue("Hello world!");
+
+      return properties;
+   \endcode
+   *
+   * \return a std::map with properties names as key.
+   * \see gd::PropertyDescriptor
+   */
+  virtual std::map<gd::String, gd::PropertyDescriptor> GetProperties() const;
+
+  /**
+   * \brief Called when the IDE wants to update a custom property of the object
+   * configuration.
+   *
+   * \return false if the new value cannot be set
+   */
+  virtual bool UpdateProperty(const gd::String& name, const gd::String& value) {
+    return false;
+  };
+  ///@}
+
+  /** \name Drawing and editing initial instances
+   * Members functions related to drawing and editing initial instances of this
+   * object configuration
+   */
+  ///@{
+  /**
+   * \brief Called when the IDE wants to know about the custom properties of an
+   * initial instance of this object configuration.
+   *
+   * \return a std::map with properties names as key and values.
+   * \see gd::InitialInstance
+   */
+  virtual std::map<gd::String, gd::PropertyDescriptor>
+  GetInitialInstanceProperties(const gd::InitialInstance& instance,
+                               gd::Project& project,
+                               gd::Layout& layout);
+
+  /**
+   * \brief Called when the IDE wants to update a custom property of an initial
+   * instance of this object configuration.
+   *
+   * \return false if the new value cannot be set
+   * \see gd::InitialInstance
+   */
+  virtual bool UpdateInitialInstanceProperty(gd::InitialInstance& instance,
+                                             const gd::String& name,
+                                             const gd::String& value,
+                                             gd::Project& project,
+                                             gd::Layout& layout) {
+    return false;
+  };
+    ///@}
+
+  /** \name Resources management
+   * Members functions related to managing resources used by the object configuration
+   */
+  ///@{
+
+  /**
+   * \brief Called ( e.g. during compilation ) so as to inventory internal
+   * resources and sometimes update their filename. Implementation example:
+   * \code
+   * worker.ExposeImage(myImage);
+   * worker.ExposeFile(myResourceFile);
+   * \endcode
+   *
+   * \see ArbitraryResourceWorker
+   */
+  virtual void ExposeResources(gd::ArbitraryResourceWorker& worker) { return; };
+  ///@}
+
+/** \name Serialization
+ * Members functions related to serialization of the object configuration
+ */
+///@{
+  /**
+   * \brief Serialize the object configuration.
+   * \see DoSerializeTo
+   */
+  void SerializeTo(SerializerElement& element) const;
+
+  /**
+   * \brief Unserialize the object configuration.
+   * \see DoUnserializeFrom
+   */
+  void UnserializeFrom(gd::Project& project, const SerializerElement& element);
+  ///@}
+
+ protected:
+  gd::String type; ///< Which type of object is represented by this
+                   ///< configuration.
+
+  /**
+   * \brief Derived object configuration can redefine this method to load
+   * custom attributes.
+   */
+  virtual void DoUnserializeFrom(gd::Project& project,
+                                 const SerializerElement& element){};
+
+  /**
+   * \brief Derived object configuration can redefine this method to save
+   * custom attributes.
+   */
+  virtual void DoSerializeTo(SerializerElement& element) const {};
+};
+
+}  // namespace gd
+
+/**
+ * Object configurations are usually managed thanks to (smart) pointers.
+ */
+using ObjConfSPtr = std::unique_ptr<gd::ObjectConfiguration>;
+
+#endif  // GDCORE_OBJECT_H
--- a/Core/GDCore/Project/ObjectsContainer.cpp
+++ b/Core/GDCore/Project/ObjectsContainer.cpp
@@ -83,7 +83,7 @@ gd::Object& ObjectsContainer::InsertNewObject(const gd::Project& project,
  gd::Object& newlyCreatedObject = *(*(initialObjects.insert(
      position < initialObjects.size() ? initialObjects.begin() + position
                                       : initialObjects.end(),
-      project.GetCurrentPlatform().CreateObject(objectType, name))));
+      project.CreateObject(objectType, name))));

  return newlyCreatedObject;
 }
--- a/Core/GDCore/Project/Project.cpp
+++ b/Core/GDCore/Project/Project.cpp
@@ -23,10 +23,12 @@
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/CustomObjectConfiguration.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectConfiguration.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ResourcesManager.h"
 #include "GDCore/Project/SourceFile.h"
@@ -79,22 +81,84 @@ Project::~Project() {}
 void Project::ResetProjectUuid() { projectUuid = UUID::MakeUuid4(); }

 std::unique_ptr<gd::Object> Project::CreateObject(
-    const gd::String& type,
-    const gd::String& name,
-    const gd::String& platformName) {
-  for (std::size_t i = 0; i < platforms.size(); ++i) {
-    if (!platformName.empty() && platforms[i]->GetName() != platformName)
-      continue;
+  const gd::String& type,
+  const gd::String& name) const {
+    return gd::make_unique<Object>(name, type, CreateObjectConfiguration(type));
+}

-    std::unique_ptr<gd::Object> object = platforms[i]->CreateObject(
-        type, name);  // Create a base object if the type can't be found in the
-                      // platform
-    if (object && object->GetType() == type)
-      return object;  // If the object is valid and has the good type (not a
-                      // base object), return it
+std::unique_ptr<gd::ObjectConfiguration> Project::CreateObjectConfiguration(
+  const gd::String& type) const {
+  if (Project::HasEventsBasedObject(type)) {
+    return gd::make_unique<CustomObjectConfiguration>(*this, type);
  }
+  else {
+    // Create a base object if the type can't be found in the platform.
+    return currentPlatform->CreateObjectConfiguration(type);
+  }
+}

-  return nullptr;
+bool Project::HasEventsBasedObject(const gd::String& type) const {
+  const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+  if (separatorIndex == std::string::npos) {
+    return false;
+  }
+  gd::String extensionName = type.substr(0, separatorIndex);
+  if (!Project::HasEventsFunctionsExtensionNamed(extensionName)) {
+    return false;
+  }
+  auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+  gd::String objectTypeName = type.substr(separatorIndex + 2);
+  return extension.GetEventsBasedObjects().Has(objectTypeName);
+}
+
+gd::EventsBasedObject& Project::GetEventsBasedObject(const gd::String& type) {
+  const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+  gd::String extensionName = type.substr(0, separatorIndex);
+  gd::String objectTypeName = type.substr(separatorIndex + 2);
+
+  auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+  return extension.GetEventsBasedObjects().Get(objectTypeName);
+}
+
+const gd::EventsBasedObject& Project::GetEventsBasedObject(const gd::String& type) const {
+  const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+  gd::String extensionName = type.substr(0, separatorIndex);
+  gd::String objectTypeName = type.substr(separatorIndex + 2);
+
+  const auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+  return extension.GetEventsBasedObjects().Get(objectTypeName);
+}
+
+bool Project::HasEventsBasedBehavior(const gd::String& type) const {
+    const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+    if (separatorIndex == std::string::npos) {
+      return false;
+    }
+    gd::String extensionName = type.substr(0, separatorIndex);
+    if (!Project::HasEventsFunctionsExtensionNamed(extensionName)) {
+      return false;
+    }
+    auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+    gd::String behaviorTypeName = type.substr(separatorIndex + 2);
+    return extension.GetEventsBasedBehaviors().Has(behaviorTypeName);
+}
+
+gd::EventsBasedBehavior& Project::GetEventsBasedBehavior(const gd::String& type) {
+    const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+    gd::String extensionName = type.substr(0, separatorIndex);
+    gd::String behaviorTypeName = type.substr(separatorIndex + 2);
+
+    auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+    return extension.GetEventsBasedBehaviors().Get(behaviorTypeName);
+}
+
+const gd::EventsBasedBehavior& Project::GetEventsBasedBehavior(const gd::String& type) const {
+    const auto separatorIndex = type.find(PlatformExtension::GetNamespaceSeparator());
+    gd::String extensionName = type.substr(0, separatorIndex);
+    gd::String behaviorTypeName = type.substr(separatorIndex + 2);
+
+    auto &extension = Project::GetEventsFunctionsExtension(extensionName);
+    return extension.GetEventsBasedBehaviors().Get(behaviorTypeName);
 }

 std::shared_ptr<gd::BaseEvent> Project::CreateEvent(
@@ -642,6 +706,38 @@ void Project::UnserializeFrom(const SerializerElement& element) {
  if (currentPlatform == NULL && !platforms.empty())
    currentPlatform = platforms.back();

+  eventsFunctionsExtensions.clear();
+  const SerializerElement& eventsFunctionsExtensionsElement =
+      element.GetChild("eventsFunctionsExtensions");
+  eventsFunctionsExtensionsElement.ConsiderAsArrayOf(
+      "eventsFunctionsExtension");
+  // First, only unserialize behaviors and objects names.
+  // As event based objects can contains CustomObject and Custom Object,
+  // this allows them to reference EventBasedBehavior and EventBasedObject
+  // respectively.
+  for (std::size_t i = 0;
+       i < eventsFunctionsExtensionsElement.GetChildrenCount();
+       ++i) {
+    const SerializerElement& eventsFunctionsExtensionElement =
+        eventsFunctionsExtensionsElement.GetChild(i);
+
+    gd::EventsFunctionsExtension& newEventsFunctionsExtension =
+        InsertNewEventsFunctionsExtension("",
+                                          GetEventsFunctionsExtensionsCount());
+    newEventsFunctionsExtension.UnserializeExtensionDeclarationFrom(
+        *this, eventsFunctionsExtensionElement);
+  }
+  // Then unserialize functions, behaviors and objects content.
+  for (std::size_t i = 0;
+       i < eventsFunctionsExtensionsElement.GetChildrenCount();
+       ++i) {
+    const SerializerElement& eventsFunctionsExtensionElement =
+        eventsFunctionsExtensionsElement.GetChild(i);
+
+    eventsFunctionsExtensions.at(i)->UnserializeExtensionImplementationFrom(
+        *this, eventsFunctionsExtensionElement);
+  }
+
  GetObjectGroups().UnserializeFrom(
      element.GetChild("objectsGroups", 0, "ObjectGroups"));
  resourcesManager.UnserializeFrom(
@@ -676,24 +772,6 @@ void Project::UnserializeFrom(const SerializerElement& element) {
    externalEvents.UnserializeFrom(*this, externalEventElement);
  }

-  eventsFunctionsExtensions.clear();
-  const SerializerElement& eventsFunctionsExtensionsElement =
-      element.GetChild("eventsFunctionsExtensions");
-  eventsFunctionsExtensionsElement.ConsiderAsArrayOf(
-      "eventsFunctionsExtension");
-  for (std::size_t i = 0;
-       i < eventsFunctionsExtensionsElement.GetChildrenCount();
-       ++i) {
-    const SerializerElement& eventsFunctionsExtensionElement =
-        eventsFunctionsExtensionsElement.GetChild(i);
-
-    gd::EventsFunctionsExtension& newEventsFunctionsExtension =
-        InsertNewEventsFunctionsExtension("",
-                                          GetEventsFunctionsExtensionsCount());
-    newEventsFunctionsExtension.UnserializeFrom(
-        *this, eventsFunctionsExtensionElement);
-  }
-
  externalLayouts.clear();
  const SerializerElement& externalLayoutsElement =
      element.GetChild("externalLayouts", 0, "ExternalLayouts");
@@ -868,8 +946,9 @@ void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
  // Add layouts resources
  for (std::size_t s = 0; s < GetLayoutsCount(); s++) {
    for (std::size_t j = 0; j < GetLayout(s).GetObjectsCount();
-         ++j)  // Add objects resources
-      GetLayout(s).GetObject(j).ExposeResources(worker);
+         ++j) { // Add objects resources
+      GetLayout(s).GetObject(j).GetConfiguration().ExposeResources(worker);
+    }

    LaunchResourceWorkerOnEvents(*this, GetLayout(s).GetEvents(), worker);
  }
@@ -888,7 +967,7 @@ void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {

  // Add global objects resources
  for (std::size_t j = 0; j < GetObjectsCount(); ++j) {
-    GetObject(j).ExposeResources(worker);
+    GetObject(j).GetConfiguration().ExposeResources(worker);
  }

  // Add loading screen background image if present
--- a/Core/GDCore/Project/Project.h
+++ b/Core/GDCore/Project/Project.h
@@ -24,7 +24,10 @@ class ExternalEvents;
 class ResourcesManager;
 class ExternalLayout;
 class EventsFunctionsExtension;
+class EventsBasedObject;
+class EventsBasedBehavior;
 class Object;
+class ObjectConfiguration;
 class VariablesContainer;
 class ArbitraryResourceWorker;
 class SourceFile;
@@ -455,20 +458,20 @@ class GD_CORE_API Project : public ObjectsContainer {

  /**
   * Create an object of the given type with the specified name.
-   *
-   * \note A project can use more than one platform. In this case, the first
-   * platform supporting the object is used, unless \a platformName argument is
-   * not empty.<br> It is assumed that each platform provides an equivalent
-   * object.
-   *
+   * 
   * \param type The type of the object
   * \param name The name of the object
-   * \param platformName The name of the platform to be used. If empty, the
-   * first platform supporting the object is used.
   */
  std::unique_ptr<gd::Object> CreateObject(const gd::String& type,
-                                           const gd::String& name,
-                                           const gd::String& platformName = "");
+                                           const gd::String& name) const;
+
+  /**
+   * Create an object configuration of the given type.
+   * 
+   * \param type The type of the object
+   */
+  std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
+      const gd::String& type) const;

  /**
   * Create an event of the given type.
@@ -827,6 +830,37 @@ class GD_CORE_API Project : public ObjectsContainer {
   * \brief Remove all the events functions extensions.
   */
  void ClearEventsFunctionsExtensions();
+
+  /**
+   * \brief  Check if events based object with a given type exists.
+   */
+  bool HasEventsBasedObject(const gd::String& type) const;
+
+  /**
+   * \brief Return the events based object with a given type.
+   */
+  gd::EventsBasedObject& GetEventsBasedObject(const gd::String& type);
+
+  /**
+   * \brief Return the events based object with a given type.
+   */
+  const gd::EventsBasedObject& GetEventsBasedObject(const gd::String& type) const;
+
+  /**
+   * \brief  Check if events based behavior with a given type exists.
+   */
+  bool HasEventsBasedBehavior(const gd::String& type) const;
+
+  /**
+   * \brief Return the events based behavior with a given type.
+   */
+  gd::EventsBasedBehavior& GetEventsBasedBehavior(const gd::String& type);
+
+  /**
+   * \brief Return the events based behavior with a given type.
+   */
+  const gd::EventsBasedBehavior& GetEventsBasedBehavior(const gd::String& type) const;
+
  ///@}

  /** \name Resources management
--- a/Core/GDCore/Serialization/SerializerElement.h
+++ b/Core/GDCore/Serialization/SerializerElement.h
@@ -22,7 +22,7 @@ namespace gd {
 * properties).
 *
 * It is used for serialization (to JSON or XML), or as a generic
- * container for properties of objects (see for example gd::BehaviorContent).
+ * container for properties of objects (see for example gd::Behavior).
 *
 * It also has specialized methods in GDevelop.js (see postjs.js) to be
 * converted to a JavaScript object.
--- a/Core/tests/ArbitraryResourceWorker.cpp
+++ b/Core/tests/ArbitraryResourceWorker.cpp
@@ -13,12 +13,14 @@
 #include "GDCore/IDE/Project/ProjectResourcesAdder.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
 #include "GDCore/Events/Builtin/StandardEvent.h"
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Serialization/Serializer.h"
 #include "GDCore/Tools/SystemStats.h"
 #include "GDCore/Tools/VersionWrapper.h"
 #include "DummyPlatform.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
 #include "catch.hpp"

 class ArbitraryResourceWorkerTest : public gd::ArbitraryResourceWorker {
@@ -63,14 +65,15 @@ TEST_CASE("ArbitraryResourceWorker", "[common][resources]") {
                      "path/to/file4.png") != worker.files.end());

    SECTION("Object using a resource") {
-      gd::SpriteObject obj("myObject");
-
+      gd::SpriteObject spriteConfiguration;
      gd::Animation anim;
      gd::Sprite sprite;
      sprite.SetImageName("res1");
      anim.SetDirectionsCount(1);
      anim.GetDirection(0).AddSprite(sprite);
-      obj.AddAnimation(anim);
+      spriteConfiguration.AddAnimation(anim);
+
+      gd::Object obj("myObject", "", spriteConfiguration.Clone());
      project.InsertObject(obj, 0);

      worker.files.clear();
--- a/Core/tests/BehaviorSerialization.cpp
+++ b/Core/tests/BehaviorSerialization.cpp
@@ -0,0 +1,209 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering serialization to JSON.
+ */
+#include "DummyPlatform.h"
+#include "GDCore/CommonTools.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Serialization.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Variable.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Tools/SystemStats.h"
+#include "GDCore/Tools/VersionWrapper.h"
+#include "catch.hpp"
+
+using namespace gd;
+
+namespace {
+
+void AddEventsBasedExtension(gd::Project &project) {
+  auto &eventsExtension =
+      project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+
+  auto &eventsBasedBehavior =
+      eventsExtension.GetEventsBasedBehaviors().InsertNew(
+          "MyEventsBasedBehavior", 0);
+  eventsBasedBehavior.SetFullName("My events based behavior");
+  eventsBasedBehavior.SetDescription("An events based behavior for test");
+  eventsBasedBehavior.SetObjectType("");
+  eventsBasedBehavior.GetPropertyDescriptors()
+      .InsertNew("MyProperty", 0)
+      .SetType("Number");
+};
+
+void AddAnotherEventsBasedExtensionWithDependency(gd::Project &project) {
+  auto &eventsExtension =
+      project.InsertNewEventsFunctionsExtension("MyOtherEventsExtension", 0);
+
+  auto &eventsBasedObject = eventsExtension.GetEventsBasedObjects().InsertNew(
+      "MyEventsBasedObject", 0);
+  eventsBasedObject.SetFullName("My events based object");
+  eventsBasedObject.SetDescription("An events based object for test");
+
+  gd::Object &object = eventsBasedObject.InsertNewObject(
+      project, "MyExtension::Sprite", "MyObject", 0);
+  gd::Behavior *behavior =
+      object.AddNewBehavior(project, "MyEventsExtension::MyEventsBasedBehavior",
+                            "MyEventsBasedBehavior");
+  behavior->UpdateProperty("MyProperty", "481516");
+};
+
+void SetupProject(gd::Project &project, gd::Platform &platform) {
+  SetupProjectWithDummyPlatform(project, platform);
+  AddEventsBasedExtension(project);
+
+  gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+  gd::Object &object =
+      layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject", 0);
+  gd::Behavior *behavior =
+      object.AddNewBehavior(project, "MyEventsExtension::MyEventsBasedBehavior",
+                            "MyEventsBasedBehavior");
+  behavior->UpdateProperty("MyProperty", "481516");
+};
+
+void CheckBehaviorPropertyInObjectContainerElement(
+    SerializerElement &objectContainerElement) {
+  REQUIRE(objectContainerElement.HasChild("objects"));
+
+  auto &objectsElement = objectContainerElement.GetChild("objects");
+  objectsElement.ConsiderAsArrayOf("object");
+  REQUIRE(objectsElement.GetChildrenCount() == 1);
+  auto &objectElement = objectsElement.GetChild(0);
+
+  REQUIRE(objectElement.GetStringAttribute("name") == "MyObject");
+  REQUIRE(objectElement.GetStringAttribute("type") == "MyExtension::Sprite");
+  REQUIRE(objectElement.HasChild("behaviors"));
+
+  auto &behaviorsElement = objectElement.GetChild("behaviors");
+  behaviorsElement.ConsiderAsArrayOf("behavior");
+  REQUIRE(behaviorsElement.GetChildrenCount() == 1);
+  auto &behaviorElement = behaviorsElement.GetChild(0);
+
+  REQUIRE(behaviorElement.GetStringAttribute("name") ==
+          "MyEventsBasedBehavior");
+  REQUIRE(behaviorElement.GetStringAttribute("type") ==
+          "MyEventsExtension::MyEventsBasedBehavior");
+  REQUIRE(behaviorElement.GetStringAttribute("MyProperty") == "481516");
+};
+
+void CheckBehaviorPropertyInElement(SerializerElement &projectElement) {
+  auto &layoutsElement = projectElement.GetChild("layouts");
+  layoutsElement.ConsiderAsArrayOf("layout");
+  REQUIRE(layoutsElement.GetChildrenCount() == 1);
+  auto &layoutElement = layoutsElement.GetChild(0);
+
+  REQUIRE(layoutElement.GetStringAttribute("name") == "Scene");
+  CheckBehaviorPropertyInObjectContainerElement(layoutElement);
+};
+
+void CheckBehaviorProperty(ObjectsContainer &container) {
+  auto &object = container.GetObject("MyObject");
+  REQUIRE(object.GetType() == "MyExtension::Sprite");
+  REQUIRE(object.HasBehaviorNamed("MyEventsBasedBehavior"));
+
+  auto &behavior = object.GetBehavior("MyEventsBasedBehavior");
+  REQUIRE(behavior.GetTypeName() == "MyEventsExtension::MyEventsBasedBehavior");
+  REQUIRE(behavior.GetProperties().size() == 1);
+  REQUIRE(behavior.GetProperties().at("MyProperty").GetValue() == "481516");
+};
+} // namespace
+
+// TODO EBO Add similar test cases for events-based objects.
+TEST_CASE("BehaviorSerialization", "[common]") {
+
+  SECTION("Save and load a project with a custom behavior property value") {
+    gd::Platform platform;
+    gd::Project writtenProject;
+    SetupProject(writtenProject, platform);
+    CheckBehaviorProperty(writtenProject.GetLayout("Scene"));
+
+    SerializerElement projectElement;
+    writtenProject.SerializeTo(projectElement);
+    CheckBehaviorPropertyInElement(projectElement);
+
+    gd::Project readProject;
+    readProject.AddPlatform(platform);
+    readProject.UnserializeFrom(projectElement);
+    CheckBehaviorProperty(readProject.GetLayout("Scene"));
+  }
+
+  SECTION("Load a project with a property value on a custom behavior that no longer exists") {
+    gd::Platform platform;
+    gd::Project writtenProject;
+    SetupProject(writtenProject, platform);
+
+    // Remove the events-based behavior
+    writtenProject.RemoveEventsFunctionsExtension("MyEventsExtension");
+
+    SerializerElement projectElement;
+    writtenProject.SerializeTo(projectElement);
+    CheckBehaviorPropertyInElement(projectElement);
+
+    gd::Project readProject;
+    readProject.AddPlatform(platform);
+    readProject.UnserializeFrom(projectElement);
+
+    // Add the events-based behavior back
+    AddEventsBasedExtension(readProject);
+
+    CheckBehaviorProperty(readProject.GetLayout("Scene"));
+  }
+
+  SECTION("Save and load a project with an event based extension dependency") {
+    gd::Platform platform;
+    gd::Project writtenProject;
+    SetupProject(writtenProject, platform);
+    AddAnotherEventsBasedExtensionWithDependency(writtenProject);
+
+    // It's important that the extension with the dependency is the first one.
+    REQUIRE(writtenProject.GetEventsFunctionsExtension(0).GetName() ==
+            "MyOtherEventsExtension");
+    REQUIRE(writtenProject.GetEventsFunctionsExtension(1).GetName() ==
+            "MyEventsExtension");
+
+    SerializerElement projectElement;
+    writtenProject.SerializeTo(projectElement);
+
+    auto &extensionsElement =
+        projectElement.GetChild("eventsFunctionsExtensions");
+    extensionsElement.ConsiderAsArrayOf("eventsFunctionsExtension");
+    REQUIRE(extensionsElement.GetChildrenCount() == 2);
+
+    auto &firstExtensionElement = extensionsElement.GetChild(0);
+    REQUIRE(firstExtensionElement.GetStringAttribute("name") ==
+            "MyOtherEventsExtension");
+    auto &eventsBasedObjectsElement =
+        firstExtensionElement.GetChild("eventsBasedObjects");
+    eventsBasedObjectsElement.ConsiderAsArrayOf("eventsBasedObject");
+    auto &eventsBasedObjectElement =
+        eventsBasedObjectsElement.GetChild(0);
+    CheckBehaviorPropertyInObjectContainerElement(eventsBasedObjectElement);
+
+    auto &secondExtensionElement = extensionsElement.GetChild(1);
+    REQUIRE(secondExtensionElement.GetStringAttribute("name") ==
+            "MyEventsExtension");
+
+    gd::Project readProject;
+    readProject.AddPlatform(platform);
+    readProject.UnserializeFrom(projectElement);
+
+    // The custom behavior is unserialized even though it depends on the other
+    // extension.
+    REQUIRE(readProject.HasEventsBasedObject(
+        "MyOtherEventsExtension::MyEventsBasedObject"));
+    CheckBehaviorProperty(readProject.GetEventsBasedObject(
+        "MyOtherEventsExtension::MyEventsBasedObject"));
+  }
+}
--- a/Core/tests/Common.cpp
+++ b/Core/tests/Common.cpp
@@ -19,6 +19,8 @@
 #include "GDCore/Tools/VersionWrapper.h"
 #include "catch.hpp"

+// TODO: Add some tests on layouts and behavior shared data.
+
 TEST_CASE("Project", "[common]") {
  SECTION("Basics") {
    gd::Project project;
--- a/Core/tests/DummyPlatform.cpp
+++ b/Core/tests/DummyPlatform.cpp
@@ -7,14 +7,19 @@
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/IDE/Events/ExpressionValidator.h"
 #include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/ObjectConfiguration.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Tools/Localization.h"
 #include "catch.hpp"

+// TODO Remove these 2 classes and write the test with events based behaviors.
 class BehaviorWithRequiredBehaviorProperty : public gd::Behavior {
 public:
-  BehaviorWithRequiredBehaviorProperty(){};
+  BehaviorWithRequiredBehaviorProperty(
+      const gd::String& name, const gd::String& type)
+      : Behavior(name, type) {};
  virtual ~BehaviorWithRequiredBehaviorProperty(){};
  virtual Behavior* Clone() const override {
    return new BehaviorWithRequiredBehaviorProperty(*this);
@@ -49,7 +54,9 @@ class BehaviorWithRequiredBehaviorProperty : public gd::Behavior {
 class BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior
    : public gd::Behavior {
 public:
-  BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior(){};
+  BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior(
+      const gd::String& name, const gd::String& type)
+      : Behavior(name, type) {};
  virtual ~BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior(){};
  virtual Behavior* Clone() const override {
    return new BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior(
@@ -93,7 +100,7 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
  // Create the base object. All objects "inherits" from it.
  baseObjectExtension->SetExtensionInformation(
      "BuiltinObject", "Base Object dummy extension", "", "", "");
-  auto& baseObject = baseObjectExtension->AddObject<gd::Object>(
+  auto& baseObject = baseObjectExtension->AddObject<gd::ObjectConfiguration>(
      "", "Dummy Base Object", "Dummy Base Object", "");

  // Add this expression for all objects. But it requires a "capability".
@@ -125,6 +132,18 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
      .AddParameter("expression", "Parameter 1 (a number)")
      .SetFunctionName("doSomething");

+  extension
+      ->AddAction("DoSomethingWithObjects",
+                  "Do something",
+                  "This does something",
+                  "Do something please",
+                  "",
+                  "",
+                  "")
+      .AddParameter("object", _("Object 1 parameter"))
+      .AddParameter("object", _("Object 2 parameter"))
+      .SetFunctionName("doSomethingWithObjects");
+
  extension
      ->AddAction("DoSomethingWithResources",
                  "Do something with resources",
@@ -209,7 +228,7 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
      .AddParameter("objectvar", _("Variable for object 2"))
      .SetFunctionName("getStringWith1ObjectParamAnd2ObjectVarParam");

-  auto& object = extension->AddObject<gd::Object>(
+  auto& object = extension->AddObject<gd::SpriteObject>(
      "Sprite", "Dummy Sprite", "Dummy sprite object", "");
  object
      .AddExpression("GetObjectVariableAsNumber",
@@ -260,10 +279,11 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
                               "Dummy behavior",
                               "MyBehavior",
                               "A dummy behavior for tests",
-                               "",
-                               "",
-                               "",
-                               gd::make_unique<gd::Behavior>(),
+                               "Group",
+                               "Icon.png",
+                               "MyBehavior",
+                               gd::make_unique<gd::Behavior>(
+                                  "Behavior", "MyExtension::MyBehavior"),
                               gd::make_unique<gd::BehaviorsSharedData>());
    behavior
        .AddAction("BehaviorDoSomething",
@@ -304,10 +324,11 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
                               "Another Dummy behavior",
                               "MyOtherBehavior",
                               "Another dummy behavior for tests",
-                               "",
-                               "",
-                               "",
-                               gd::make_unique<gd::Behavior>(),
+                               "Group",
+                               "Icon.png",
+                               "MyOtherBehavior",
+                               gd::make_unique<gd::Behavior>(
+                                  "Behavior", "MyExtension::MyOtherBehavior"),
                               gd::make_unique<gd::BehaviorsSharedData>());
  }

@@ -317,10 +338,11 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
        "BehaviorWithRequiredBehaviorProperty",
        "BehaviorWithRequiredBehaviorProperty",
        "A dummy behavior requiring another behavior (MyBehavior)",
-        "",
-        "",
-        "",
-        gd::make_unique<BehaviorWithRequiredBehaviorProperty>(),
+        "Group",
+        "Icon.png",
+        "BehaviorWithRequiredBehaviorProperty",
+        gd::make_unique<BehaviorWithRequiredBehaviorProperty>(
+            "Behavior", "MyExtension::BehaviorWithRequiredBehaviorProperty"),
        gd::make_unique<gd::BehaviorsSharedData>());
  }
  {
@@ -331,17 +353,19 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
        "A dummy behavior requiring another behavior "
        "(BehaviorWithRequiredBehaviorProperty) that itself requires another "
        "behavior (MyBehavior)",
-        "",
-        "",
-        "",
+        "Group",
+        "Icon.png",
+        "BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior",
        gd::make_unique<
-            BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior>(),
+            BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior>(
+                "Behavior",
+                "MyExtension::BehaviorWithRequiredBehaviorPropertyRequiringAnotherBehavior"),
        gd::make_unique<gd::BehaviorsSharedData>());
  }

  {
    auto& object = extension
-                       ->AddObject<gd::Object>(
+                       ->AddObject<gd::ObjectConfiguration>(
                           "FakeObjectWithUnsupportedCapability",
                           "FakeObjectWithUnsupportedCapability",
                           "This is FakeObjectWithUnsupportedCapability",
--- a/Core/tests/EventsExtension.cpp
+++ b/Core/tests/EventsExtension.cpp
@@ -0,0 +1,76 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering events-based extensions
+ */
+#include "GDCore/IDE/WholeProjectRefactorer.h"
+
+#include <algorithm>
+#include <stdexcept>
+
+#include "DummyPlatform.h"
+#include "GDCore/Events/Builtin/LinkEvent.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Extensions/PlatformExtension.h"
+#include "GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h"
+#include "GDCore/Project/Behavior.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Project/ExternalLayout.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Variable.h"
+#include "catch.hpp"
+
+namespace {
+
+gd::EventsFunctionsExtension &
+SetupProjectWithEventsFunctionExtension(gd::Project &project) {
+  auto &eventsExtension =
+      project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+
+  // Add an events-based behavior
+  {
+    auto &eventsBasedBehavior =
+        eventsExtension.GetEventsBasedBehaviors().InsertNew(
+            "MyEventsBasedBehavior", 0);
+    eventsBasedBehavior.SetFullName("My events based behavior");
+    eventsBasedBehavior.SetDescription("An events based behavior for test");
+
+    // Add a property
+    eventsBasedBehavior.GetPropertyDescriptors()
+        .InsertNew("MyProperty", 0)
+        .SetValue("123")
+        .SetType("Number");
+  }
+
+  return eventsExtension;
+}
+} // namespace
+
+TEST_CASE("Events-based extension", "[common]") {
+  SECTION("Behavior property default value") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout1.InsertNewObject(project, "MyExtension::Sprite", "Object1", 0);
+
+    // Attach a behavior to an object.
+    auto *behavior = object.AddNewBehavior(project, "MyEventsExtension::MyEventsBasedBehavior", "MyEventsBasedBehavior");
+    behavior->InitializeContent();
+
+    // The behavior has the default value.
+    REQUIRE(behavior->GetProperties().size() == 1);
+    REQUIRE(behavior->GetProperties().at("MyProperty").GetValue() == "123");
+  }
+}
--- a/Core/tests/EventsIdentifiersFinder.cpp
+++ b/Core/tests/EventsIdentifiersFinder.cpp
@@ -0,0 +1,289 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering common features of GDevelop Core.
+ */
+#include "GDCore/IDE/Events/EventsIdentifiersFinder.h"
+#include "GDCore/Events/Builtin/LinkEvent.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "catch.hpp"
+
+namespace {
+const void DeclareTimerExtension(gd::Project &project, gd::Platform &platform) {
+  std::shared_ptr<gd::PlatformExtension> extension =
+      std::shared_ptr<gd::PlatformExtension>(new gd::PlatformExtension);
+  gd::BuiltinExtensionsImplementer::ImplementsTimeExtension(*(extension.get()));
+  gd::BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
+      *(extension.get()));
+  // Add an instruction to test expressions.
+  extension
+      ->AddAction("DoSomething", "Do something", "This does something",
+                  "Do something please", "", "", "")
+      .AddParameter("expression", "Parameter 1 (a number)");
+  platform.AddExtension(extension);
+  project.AddPlatform(platform);
+}
+
+const gd::StandardEvent UseSceneTimer(const gd::String &name) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("ResetTimer");
+  instruction.SetParametersCount(2);
+  instruction.SetParameter(0, gd::Expression("scene"));
+  instruction.SetParameter(1, gd::Expression("\"" + name + "\""));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent UseObjectTimer(const gd::String &objectName,
+                                       const gd::String &timerName) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("ResetObjectTimer");
+  instruction.SetParametersCount(2);
+  instruction.SetParameter(0, gd::Expression(objectName));
+  instruction.SetParameter(1, gd::Expression("\"" + timerName + "\""));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent UseSceneTimerInExpression(const gd::String &name) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("DoSomething");
+  instruction.SetParametersCount(1);
+  instruction.SetParameter(
+      0, gd::Expression("1 + TimerElapsedTime(\"" + name + "\")"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent
+UseObjectTimerInExpression(const gd::String &objectName,
+                           const gd::String &timerName) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("DoSomething");
+  instruction.SetParametersCount(1);
+  instruction.SetParameter(0, gd::Expression("1 + " + objectName +
+                                             ".ObjectTimerElapsedTime(\"" + timerName +
+                                             "\")"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const void UseExternalEvents(gd::Layout &layout,
+                             gd::ExternalEvents &externalEvents) {
+  gd::LinkEvent linkEvent;
+  linkEvent.SetTarget(externalEvents.GetName());
+  layout.GetEvents().InsertEvent(linkEvent);
+}
+} // namespace
+
+TEST_CASE("EventsIdentifiersFinder (scene timers)", "[common]") {
+  SECTION("Can find scene timers in scenes") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    layout.GetEvents().InsertEvent(UseSceneTimer("MySceneTimer"));
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "sceneTimer");
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MySceneTimer\"");
+  }
+
+  SECTION("Can find scene timers in scene expressions") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    layout.GetEvents().InsertEvent(UseSceneTimerInExpression("MySceneTimer"));
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "sceneTimer");
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MySceneTimer\"");
+  }
+
+  SECTION("Can find scene timers in external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(UseSceneTimer("MySceneTimer"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "sceneTimer");
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MySceneTimer\"");
+  }
+
+  SECTION("Can find scene timers the right scene") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+    layout1.GetEvents().InsertEvent(UseSceneTimer("MySceneTimerInLayout1"));
+
+    auto &layout2 = project.InsertNewLayout("Layout2", 0);
+    layout2.GetEvents().InsertEvent(UseSceneTimer("MySceneTimerInLayout2"));
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout1, "sceneTimer");
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MySceneTimerInLayout1\"");
+  }
+
+  SECTION("Can find scene timers in the right external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+    auto &externalEvents1 =
+        project.InsertNewExternalEvents("ExternalEvents1", 0);
+    externalEvents1.GetEvents().InsertEvent(
+        UseSceneTimer("MySceneTimerInExternalEvents1"));
+    UseExternalEvents(layout1, externalEvents1);
+
+    auto &layout2 = project.InsertNewLayout("Layout2", 0);
+    auto &externalEvents2 =
+        project.InsertNewExternalEvents("ExternalEvents2", 0);
+    externalEvents2.GetEvents().InsertEvent(
+        UseSceneTimer("MySceneTimerInExternalEvents2"));
+    UseExternalEvents(layout2, externalEvents2);
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout1, "sceneTimer");
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) ==
+            "\"MySceneTimerInExternalEvents1\"");
+  }
+}
+
+TEST_CASE("EventsIdentifiersFinder (object timers)", "[common]") {
+  SECTION("Can find object timers in scenes") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout.InsertNewObject(project, "", "MyObject", 0);
+    layout.GetEvents().InsertEvent(UseObjectTimer("MyObject", "MyObjectTimer"));
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "objectTimer", object.GetName());
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MyObjectTimer\"");
+  }
+
+  SECTION("Can find object timers in scene expression") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout.InsertNewObject(project, "", "MyObject", 0);
+    layout.GetEvents().InsertEvent(UseObjectTimerInExpression("MyObject", "MyObjectTimer"));
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "objectTimer", object.GetName());
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MyObjectTimer\"");
+  }
+
+  SECTION("Can find object timers in external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout.InsertNewObject(project, "", "MyObject", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(
+        UseObjectTimer("MyObject", "MyObjectTimer"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "objectTimer", object.GetName());
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MyObjectTimer\"");
+  }
+
+  SECTION("Can find object timers in scenes for the right object") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object1 = layout.InsertNewObject(project, "", "MyObject1", 0);
+    auto &object2 = layout.InsertNewObject(project, "", "MyObject2", 0);
+    layout.GetEvents().InsertEvent(
+        UseObjectTimer("MyObject1", "MyObjectTimer1"));
+    layout.GetEvents().InsertEvent(
+        UseObjectTimer("MyObject2", "MyObjectTimer2"));
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "objectTimer", object1.GetName());
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MyObjectTimer1\"");
+  }
+
+  SECTION("Can find object timers in external layouts for the right object") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareTimerExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object1 = layout.InsertNewObject(project, "", "MyObject1", 0);
+    auto &object2 = layout.InsertNewObject(project, "", "MyObject2", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(
+        UseObjectTimer("MyObject1", "MyObjectTimer1"));
+    externalEvents.GetEvents().InsertEvent(
+        UseObjectTimer("MyObject2", "MyObjectTimer2"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto identifierExpressions =
+        gd::EventsIdentifiersFinder::FindAllIdentifierExpressions(
+            platform, project, layout, "objectTimer", object1.GetName());
+
+    REQUIRE(identifierExpressions.size() == 1);
+    REQUIRE(*(identifierExpressions.begin()) == "\"MyObjectTimer1\"");
+  }
+}
--- a/Core/tests/EventsVariablesFinder.cpp
+++ b/Core/tests/EventsVariablesFinder.cpp
@@ -0,0 +1,360 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering common features of GDevelop Core.
+ */
+#include "GDCore/IDE/Events/EventsVariablesFinder.h"
+#include "GDCore/Events/Builtin/LinkEvent.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Variable.h"
+#include "catch.hpp"
+
+namespace {
+const void DeclareVariableExtension(gd::Project &project,
+                                    gd::Platform &platform) {
+  std::shared_ptr<gd::PlatformExtension> extension =
+      std::shared_ptr<gd::PlatformExtension>(new gd::PlatformExtension);
+  gd::BuiltinExtensionsImplementer::ImplementsVariablesExtension(
+      *(extension.get()));
+  gd::BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
+      *(extension.get()));
+  // Add an instruction to test expressions.
+  extension
+      ->AddAction("DoSomething", "Do something", "This does something",
+                  "Do something please", "", "", "")
+      .AddParameter("expression", "Parameter 1 (a number)");
+  platform.AddExtension(extension);
+  project.AddPlatform(platform);
+}
+
+const gd::StandardEvent UseGlobalVariable(const gd::String &name) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("ModVarGlobal");
+  instruction.SetParametersCount(2);
+  instruction.SetParameter(0, gd::Expression(name));
+  instruction.SetParameter(1, gd::Expression("0"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent UseSceneVariable(const gd::String &name) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("ModVarScene");
+  instruction.SetParametersCount(2);
+  instruction.SetParameter(0, gd::Expression(name));
+  instruction.SetParameter(1, gd::Expression("0"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent UseObjectVariable(const gd::String &objectName,
+                                          const gd::String &variableName) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("ModVarObjet");
+  instruction.SetParametersCount(3);
+  instruction.SetParameter(0, gd::Expression(objectName));
+  instruction.SetParameter(1, gd::Expression(variableName));
+  instruction.SetParameter(2, gd::Expression("0"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent UseGlobalVariableInExpression(const gd::String &name) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("DoSomething");
+  instruction.SetParametersCount(1);
+  instruction.SetParameter(0,
+                           gd::Expression("1 + GlobalVariable(" + name + ")"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent UseSceneVariableInExpression(const gd::String &name) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("DoSomething");
+  instruction.SetParametersCount(1);
+  instruction.SetParameter(0, gd::Expression("1 + Variable(" + name + ")"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const gd::StandardEvent
+UseObjectVariableInExpression(const gd::String &objectName,
+                              const gd::String &variableName) {
+  gd::StandardEvent event;
+  gd::Instruction instruction;
+  instruction.SetType("DoSomething");
+  instruction.SetParametersCount(1);
+  instruction.SetParameter(
+      0,
+      gd::Expression("1 + " + objectName + ".Variable(" + variableName + ")"));
+  event.GetActions().Insert(instruction);
+  return event;
+}
+
+const void UseExternalEvents(gd::Layout &layout,
+                             gd::ExternalEvents &externalEvents) {
+  gd::LinkEvent linkEvent;
+  linkEvent.SetTarget(externalEvents.GetName());
+  layout.GetEvents().InsertEvent(linkEvent);
+}
+} // namespace
+
+TEST_CASE("EventsVariablesFinder (FindAllGlobalVariables)", "[common]") {
+  SECTION("Can find global variables in scenes") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    layout.GetEvents().InsertEvent(UseGlobalVariable("MyGlobalVariable"));
+
+    auto variableNames =
+        gd::EventsVariablesFinder::FindAllGlobalVariables(platform, project);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyGlobalVariable");
+  }
+
+  SECTION("Can find global variables in scene expressions") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    layout.GetEvents().InsertEvent(
+        UseGlobalVariableInExpression("MyGlobalVariable"));
+
+    auto variableNames =
+        gd::EventsVariablesFinder::FindAllGlobalVariables(platform, project);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyGlobalVariable");
+  }
+
+  SECTION("Can find global variables in external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(
+        UseGlobalVariable("MyGlobalVariable"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto variableNames =
+        gd::EventsVariablesFinder::FindAllGlobalVariables(platform, project);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyGlobalVariable");
+  }
+}
+
+TEST_CASE("EventsVariablesFinder (FindAllLayoutVariables)", "[common]") {
+  SECTION("Can find scene variables in scenes") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    layout.GetEvents().InsertEvent(UseSceneVariable("MySceneVariable"));
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllLayoutVariables(
+        platform, project, layout);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MySceneVariable");
+  }
+
+  SECTION("Can find scene variables in scene expressions") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    layout.GetEvents().InsertEvent(
+        UseSceneVariableInExpression("MySceneVariable"));
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllLayoutVariables(
+        platform, project, layout);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MySceneVariable");
+  }
+
+  SECTION("Can find scene variables in external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(UseSceneVariable("MySceneVariable"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllLayoutVariables(
+        platform, project, layout);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MySceneVariable");
+  }
+
+  SECTION("Can find scene variables the right scene") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+    layout1.GetEvents().InsertEvent(
+        UseSceneVariable("MySceneVariableInLayout1"));
+
+    auto &layout2 = project.InsertNewLayout("Layout2", 0);
+    layout2.GetEvents().InsertEvent(
+        UseSceneVariable("MySceneVariableInLayout2"));
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllLayoutVariables(
+        platform, project, layout1);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MySceneVariableInLayout1");
+  }
+
+  SECTION("Can find scene variables in the right external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+    auto &externalEvents1 =
+        project.InsertNewExternalEvents("ExternalEvents1", 0);
+    externalEvents1.GetEvents().InsertEvent(
+        UseSceneVariable("MySceneVariableInExternalEvents1"));
+    UseExternalEvents(layout1, externalEvents1);
+
+    auto &layout2 = project.InsertNewLayout("Layout2", 0);
+    auto &externalEvents2 =
+        project.InsertNewExternalEvents("ExternalEvents2", 0);
+    externalEvents2.GetEvents().InsertEvent(
+        UseSceneVariable("MySceneVariableInExternalEvents2"));
+    UseExternalEvents(layout2, externalEvents2);
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllLayoutVariables(
+        platform, project, layout1);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MySceneVariableInExternalEvents1");
+  }
+}
+
+TEST_CASE("EventsVariablesFinder (FindAllObjectVariables)", "[common]") {
+  SECTION("Can find object variables in scenes") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout.InsertNewObject(project, "", "MyObject", 0);
+    layout.GetEvents().InsertEvent(
+        UseObjectVariable("MyObject", "MyObjectVariable"));
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllObjectVariables(
+        platform, project, layout, object);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyObjectVariable");
+  }
+
+  SECTION("Can find object variables in scene expressions") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout.InsertNewObject(project, "", "MyObject", 0);
+    layout.GetEvents().InsertEvent(
+        UseObjectVariableInExpression("MyObject", "MyObjectVariable"));
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllObjectVariables(
+        platform, project, layout, object);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyObjectVariable");
+  }
+
+  SECTION("Can find object variables in external layouts") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object = layout.InsertNewObject(project, "", "MyObject", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(
+        UseObjectVariable("MyObject", "MyObjectVariable"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllObjectVariables(
+        platform, project, layout, object);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyObjectVariable");
+  }
+
+  SECTION("Can find object variables in scenes for the right object") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object1 = layout.InsertNewObject(project, "", "MyObject1", 0);
+    auto &object2 = layout.InsertNewObject(project, "", "MyObject2", 0);
+    layout.GetEvents().InsertEvent(
+        UseObjectVariable("MyObject1", "MyObjectVariable1"));
+    layout.GetEvents().InsertEvent(
+        UseObjectVariable("MyObject2", "MyObjectVariable2"));
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllObjectVariables(
+        platform, project, layout, object1);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyObjectVariable1");
+  }
+
+  SECTION(
+      "Can find object variables in external layouts for the right object") {
+    gd::Project project;
+    gd::Platform platform;
+    DeclareVariableExtension(project, platform);
+
+    auto &layout = project.InsertNewLayout("Layout1", 0);
+    auto &object1 = layout.InsertNewObject(project, "", "MyObject1", 0);
+    auto &object2 = layout.InsertNewObject(project, "", "MyObject2", 0);
+    auto &externalEvents = project.InsertNewExternalEvents("ExternalEvents", 0);
+    externalEvents.GetEvents().InsertEvent(
+        UseObjectVariable("MyObject1", "MyObjectVariable1"));
+    externalEvents.GetEvents().InsertEvent(
+        UseObjectVariable("MyObject2", "MyObjectVariable2"));
+    UseExternalEvents(layout, externalEvents);
+
+    auto variableNames = gd::EventsVariablesFinder::FindAllObjectVariables(
+        platform, project, layout, object1);
+
+    REQUIRE(variableNames.size() == 1);
+    REQUIRE(*(variableNames.begin()) == "MyObjectVariable1");
+  }
+}
--- a/Core/tests/ObjectSerialization.cpp
+++ b/Core/tests/ObjectSerialization.cpp
@@ -0,0 +1,228 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+/**
+ * @file Tests covering serialization to JSON.
+ */
+#include "DummyPlatform.h"
+#include "GDCore/CommonTools.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Events/Serialization.h"
+#include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/CustomObjectConfiguration.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Object.h"
+#include "GDCore/Project/ObjectsContainer.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/Project/Variable.h"
+#include "GDCore/Serialization/Serializer.h"
+#include "GDCore/Tools/SystemStats.h"
+#include "GDCore/Tools/VersionWrapper.h"
+#include "catch.hpp"
+
+using namespace gd;
+
+namespace {
+
+void SetupSpriteConfiguration(gd::ObjectConfiguration &configuration) {
+  auto *spriteConfiguration = dynamic_cast<gd::SpriteObject *>(&configuration);
+  REQUIRE(spriteConfiguration != nullptr);
+  gd::Animation animation;
+  animation.SetName("Idle");
+  spriteConfiguration->AddAnimation(animation);
+};
+
+gd::Object &SetupProjectWithSprite(gd::Project &project,
+                                   gd::Platform &platform) {
+  SetupProjectWithDummyPlatform(project, platform);
+
+  gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+  gd::Object &object =
+      layout.InsertNewObject(project, "MyExtension::Sprite", "MyObject", 0);
+  SetupSpriteConfiguration(object.GetConfiguration());
+
+  return object;
+};
+
+void CheckSpriteConfigurationInObjectElement(SerializerElement &objectElement) {
+  REQUIRE(objectElement.HasChild("animations"));
+  auto &animationsElement = objectElement.GetChild("animations");
+  animationsElement.ConsiderAsArrayOf("animation");
+  REQUIRE(animationsElement.GetChildrenCount() == 1);
+  auto &animationElement = animationsElement.GetChild(0);
+
+  REQUIRE(animationElement.GetStringAttribute("name") == "Idle");
+};
+
+void CheckSpriteConfigurationInProjectElement(
+    SerializerElement &projectElement) {
+  auto &layoutsElement = projectElement.GetChild("layouts");
+  layoutsElement.ConsiderAsArrayOf("layout");
+  REQUIRE(layoutsElement.GetChildrenCount() == 1);
+  auto &layoutElement = layoutsElement.GetChild(0);
+
+  REQUIRE(layoutElement.GetStringAttribute("name") == "Scene");
+  REQUIRE(layoutElement.HasChild("objects"));
+
+  auto &objectsElement = layoutElement.GetChild("objects");
+  objectsElement.ConsiderAsArrayOf("object");
+  REQUIRE(objectsElement.GetChildrenCount() == 1);
+  auto &objectElement = objectsElement.GetChild(0);
+
+  REQUIRE(objectElement.GetStringAttribute("name") == "MyObject");
+  REQUIRE(objectElement.GetStringAttribute("type") == "MyExtension::Sprite");
+  CheckSpriteConfigurationInObjectElement(objectElement);
+};
+
+void CheckSpriteConfiguration(gd::ObjectConfiguration &configuration) {
+  auto *spriteConfiguration = dynamic_cast<gd::SpriteObject *>(&configuration);
+  REQUIRE(spriteConfiguration);
+  REQUIRE(spriteConfiguration->GetAnimationsCount() == 1);
+
+  auto &animation = spriteConfiguration->GetAnimation(0);
+  REQUIRE(animation.GetName() == "Idle");
+};
+
+void CheckSpriteConfiguration(gd::Object &object) {
+  REQUIRE(object.GetName() == "MyObject");
+  REQUIRE(object.GetType() == "MyExtension::Sprite");
+
+  CheckSpriteConfiguration(object.GetConfiguration());
+};
+
+void CheckSpriteConfiguration(gd::Project &project) {
+  auto &layout = project.GetLayout("Scene");
+  auto &object = layout.GetObject("MyObject");
+  CheckSpriteConfiguration(object);
+};
+
+gd::Object &SetupProjectWithCustomObject(gd::Project &project,
+                                         gd::Platform &platform) {
+  SetupProjectWithDummyPlatform(project, platform);
+
+  auto &eventsExtension =
+      project.InsertNewEventsFunctionsExtension("MyEventsExtension", 0);
+  auto &eventsBasedObject = eventsExtension.GetEventsBasedObjects().InsertNew(
+      "MyEventsBasedObject", 0);
+  eventsBasedObject.SetFullName("My events based object");
+  eventsBasedObject.SetDescription("An events based object for test");
+  eventsBasedObject.InsertNewObject(project, "MyExtension::Sprite", "MyChild",
+                                    0);
+
+  gd::Layout &layout = project.InsertNewLayout("Scene", 0);
+  gd::Object &object = layout.InsertNewObject(
+      project, "MyEventsExtension::MyEventsBasedObject", "MyObject", 0);
+  auto &configuration = object.GetConfiguration();
+  auto *customObjectConfiguration =
+      dynamic_cast<gd::CustomObjectConfiguration *>(&configuration);
+  auto &spriteConfiguration =
+      customObjectConfiguration->GetChildObjectConfiguration("MyChild");
+  SetupSpriteConfiguration(spriteConfiguration);
+
+  return object;
+};
+
+void CheckCustomObjectConfigurationInProjectElement(
+    SerializerElement &projectElement) {
+  auto &layoutsElement = projectElement.GetChild("layouts");
+  layoutsElement.ConsiderAsArrayOf("layout");
+  REQUIRE(layoutsElement.GetChildrenCount() == 1);
+  auto &layoutElement = layoutsElement.GetChild(0);
+
+  REQUIRE(layoutElement.GetStringAttribute("name") == "Scene");
+  REQUIRE(layoutElement.HasChild("objects"));
+
+  auto &objectsElement = layoutElement.GetChild("objects");
+  objectsElement.ConsiderAsArrayOf("object");
+  REQUIRE(objectsElement.GetChildrenCount() == 1);
+  auto &objectElement = objectsElement.GetChild(0);
+
+  REQUIRE(objectElement.GetStringAttribute("name") == "MyObject");
+  REQUIRE(objectElement.GetStringAttribute("type") ==
+          "MyEventsExtension::MyEventsBasedObject");
+  auto &childrenContentElement = objectElement.GetChild("childrenContent");
+
+  REQUIRE(childrenContentElement.HasChild("MyChild"));
+  auto &childElement = childrenContentElement.GetChild("MyChild");
+  CheckSpriteConfigurationInObjectElement(childElement);
+};
+
+void CheckCustomObjectConfiguration(gd::Object &object) {
+  REQUIRE(object.GetName() == "MyObject");
+  REQUIRE(object.GetType() == "MyEventsExtension::MyEventsBasedObject");
+
+  auto &configuration = object.GetConfiguration();
+  auto *customObjectConfiguration =
+      dynamic_cast<gd::CustomObjectConfiguration *>(&configuration);
+  auto &spriteConfiguration =
+      customObjectConfiguration->GetChildObjectConfiguration("MyChild");
+  CheckSpriteConfiguration(spriteConfiguration);
+};
+
+void CheckCustomObjectConfiguration(gd::Project &project) {
+  auto &layout = project.GetLayout("Scene");
+  auto &object = layout.GetObject("MyObject");
+  CheckCustomObjectConfiguration(object);
+};
+} // namespace
+
+TEST_CASE("ObjectSerialization", "[common]") {
+
+  SECTION("Save and load a project with a sprite configuration") {
+    gd::Platform platform;
+    gd::Project writtenProject;
+    SetupProjectWithSprite(writtenProject, platform);
+    CheckSpriteConfiguration(writtenProject);
+
+    SerializerElement projectElement;
+    writtenProject.SerializeTo(projectElement);
+    CheckSpriteConfigurationInProjectElement(projectElement);
+
+    gd::Project readProject;
+    readProject.AddPlatform(platform);
+    readProject.UnserializeFrom(projectElement);
+    CheckSpriteConfiguration(readProject);
+  }
+
+  SECTION("Clone a sprite object") {
+    gd::Platform platform;
+    gd::Project project;
+    auto &object = SetupProjectWithSprite(project, platform);
+    CheckSpriteConfiguration(object);
+
+    auto clonedObject = object.Clone();
+    CheckSpriteConfiguration(*(clonedObject.get()));
+  }
+
+  SECTION("Save and load a project with a custom object configuration") {
+    gd::Platform platform;
+    gd::Project writtenProject;
+    SetupProjectWithCustomObject(writtenProject, platform);
+    CheckCustomObjectConfiguration(writtenProject);
+
+    SerializerElement projectElement;
+    writtenProject.SerializeTo(projectElement);
+    CheckCustomObjectConfigurationInProjectElement(projectElement);
+
+    gd::Project readProject;
+    readProject.AddPlatform(platform);
+    readProject.UnserializeFrom(projectElement);
+    CheckCustomObjectConfiguration(readProject);
+  }
+
+  SECTION("Clone a custom object") {
+    gd::Platform platform;
+    gd::Project project;
+    auto &object = SetupProjectWithCustomObject(project, platform);
+    CheckCustomObjectConfiguration(object);
+
+    auto clonedObject = object.Clone();
+    CheckCustomObjectConfiguration(*(clonedObject.get()));
+  }
+}
--- a/Core/tests/WholeProjectRefactorer.cpp
+++ b/Core/tests/WholeProjectRefactorer.cpp
--- a/Extensions/AdMob/JsExtension.js
+++ b/Extensions/AdMob/JsExtension.js
@@ -58,7 +58,7 @@ module.exports = {
      .setName('AdMob Cordova plugin')
      .setDependencyType('cordova')
      .setExportName('gdevelop-cordova-admob-plus')
-      .setVersion('0.43.0')
+      .setVersion('0.45.0')
      .setExtraSetting(
        'APP_ID_ANDROID',
        new gd.PropertyDescriptor('AdMobAppIdAndroid').setType(
--- a/Extensions/AdvancedWindow/JsExtension.js
+++ b/Extensions/AdvancedWindow/JsExtension.js
@@ -28,7 +28,7 @@ module.exports = {
        'Arthur Pacaud (arthuro555)',
        'MIT'
      )
-      .setCategory('Device');
+      .setCategory('User interface');
    extension
      .addInstructionOrExpressionGroupMetadata(_('Advanced window management'))
      .setIcon('res/actions/window24.png');
--- a/Extensions/AnchorBehavior/AnchorBehavior.cpp
+++ b/Extensions/AnchorBehavior/AnchorBehavior.cpp
@@ -105,9 +105,9 @@ std::map<gd::String, gd::PropertyDescriptor> AnchorBehavior::GetProperties(

  properties[("useLegacyBottomAndRightAnchors")]
      .SetLabel(_(
-          "Stretch object when anchoring right or bottom ledge (deprecated, "
-          "it's recommended to let this unchecked and anchor both sides if you "
-          "want Sprite to stretch instead.)"))
+          "Stretch object when anchoring right or bottom edge (deprecated, "
+          "it's recommended to leave this unchecked and anchor both sides if "
+          "you want Sprite to stretch instead.)"))
      .SetGroup(_("Deprecated options (advanced)"))
      .SetValue(behaviorContent.GetBoolAttribute(
                    "useLegacyBottomAndRightAnchors", true)
--- a/Extensions/AnchorBehavior/Extension.cpp
+++ b/Extensions/AnchorBehavior/Extension.cpp
@@ -17,6 +17,7 @@ void DeclareAnchorBehaviorExtension(gd::PlatformExtension& extension) {
                               _("Anchor objects to the window's bounds."),
                               "Victor Levasseur",
                               "Open source (MIT License)")
+      .SetCategory("User interface")
      .SetExtensionHelpPath("/behaviors/anchor");

  gd::BehaviorMetadata& aut = extension.AddBehavior(
--- a/Extensions/AnchorBehavior/anchorruntimebehavior.ts
+++ b/Extensions/AnchorBehavior/anchorruntimebehavior.ts
@@ -17,8 +17,12 @@ namespace gdjs {
    _bottomEdgeDistance: number = 0;
    _useLegacyBottomAndRightAnchors: boolean = false;

-    constructor(runtimeScene, behaviorData, owner) {
-      super(runtimeScene, behaviorData, owner);
+    constructor(
+      instanceContainer: gdjs.RuntimeInstanceContainer,
+      behaviorData,
+      owner: gdjs.RuntimeObject
+    ) {
+      super(instanceContainer, behaviorData, owner);
      this._relativeToOriginalWindowSize = !!behaviorData.relativeToOriginalWindowSize;
      this._leftEdgeAnchor = behaviorData.leftEdgeAnchor;
      this._rightEdgeAnchor = behaviorData.rightEdgeAnchor;
@@ -65,11 +69,15 @@ namespace gdjs {
      this._invalidDistances = true;
    }

-    doStepPreEvents(runtimeScene) {
-      const game = runtimeScene.getGame();
+    doStepPreEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
+      const workingPoint: FloatPoint = gdjs.staticArray(
+        gdjs.AnchorRuntimeBehavior.prototype.doStepPreEvents
+      ) as FloatPoint;
+      // TODO EBO Make it work with event based objects or hide this behavior for them.
+      const game = instanceContainer.getGame();
      let rendererWidth = game.getGameResolutionWidth();
      let rendererHeight = game.getGameResolutionHeight();
-      const layer = runtimeScene.getLayer(this.owner.getLayer());
+      const layer = instanceContainer.getLayer(this.owner.getLayer());
      if (this._invalidDistances) {
        if (this._relativeToOriginalWindowSize) {
          rendererWidth = game.getOriginalWidth();
@@ -79,7 +87,9 @@ namespace gdjs {
        //Calculate the distances from the window's bounds.
        const topLeftPixel = layer.convertCoords(
          this.owner.getDrawableX(),
-          this.owner.getDrawableY()
+          this.owner.getDrawableY(),
+          0,
+          workingPoint
        );

        //Left edge
@@ -125,9 +135,12 @@ namespace gdjs {
            }
          }
        }
+        // It's fine to reuse workingPoint as topLeftPixel is no longer used.
        const bottomRightPixel = layer.convertCoords(
          this.owner.getDrawableX() + this.owner.getWidth(),
-          this.owner.getDrawableY() + this.owner.getHeight()
+          this.owner.getDrawableY() + this.owner.getHeight(),
+          0,
+          workingPoint
        );

        //Right edge
@@ -268,11 +281,24 @@ namespace gdjs {
            }
          }
        }
-        const topLeftCoord = layer.convertInverseCoords(leftPixel, topPixel);
+        // It's fine to reuse workingPoint as topLeftPixel is no longer used.
+        const topLeftCoord = layer.convertInverseCoords(
+          leftPixel,
+          topPixel,
+          0,
+          workingPoint
+        );
+        const left = topLeftCoord[0];
+        const top = topLeftCoord[1];
+
        const bottomRightCoord = layer.convertInverseCoords(
          rightPixel,
-          bottomPixel
+          bottomPixel,
+          0,
+          workingPoint
        );
+        const right = bottomRightCoord[0];
+        const bottom = bottomRightCoord[1];

        // Compatibility with GD <= 5.0.133
        if (this._useLegacyBottomAndRightAnchors) {
@@ -281,25 +307,25 @@ namespace gdjs {
            this._rightEdgeAnchor !==
            AnchorRuntimeBehavior.HorizontalAnchor.NONE
          ) {
-            this.owner.setWidth(bottomRightCoord[0] - topLeftCoord[0]);
+            this.owner.setWidth(right - left);
          }
          if (
            this._bottomEdgeAnchor !== AnchorRuntimeBehavior.VerticalAnchor.NONE
          ) {
-            this.owner.setHeight(bottomRightCoord[1] - topLeftCoord[1]);
+            this.owner.setHeight(bottom - top);
          }
          if (
            this._leftEdgeAnchor !== AnchorRuntimeBehavior.HorizontalAnchor.NONE
          ) {
            this.owner.setX(
-              topLeftCoord[0] + this.owner.getX() - this.owner.getDrawableX()
+              left + this.owner.getX() - this.owner.getDrawableX()
            );
          }
          if (
            this._topEdgeAnchor !== AnchorRuntimeBehavior.VerticalAnchor.NONE
          ) {
            this.owner.setY(
-              topLeftCoord[1] + this.owner.getY() - this.owner.getDrawableY()
+              top + this.owner.getY() - this.owner.getDrawableY()
            );
          }
        }
@@ -311,15 +337,15 @@ namespace gdjs {
              AnchorRuntimeBehavior.HorizontalAnchor.NONE &&
            this._leftEdgeAnchor !== AnchorRuntimeBehavior.HorizontalAnchor.NONE
          ) {
-            this.owner.setWidth(bottomRightCoord[0] - topLeftCoord[0]);
-            this.owner.setX(topLeftCoord[0]);
+            this.owner.setWidth(right - left);
+            this.owner.setX(left);
          } else {
            if (
              this._leftEdgeAnchor !==
              AnchorRuntimeBehavior.HorizontalAnchor.NONE
            ) {
              this.owner.setX(
-                topLeftCoord[0] + this.owner.getX() - this.owner.getDrawableX()
+                left + this.owner.getX() - this.owner.getDrawableX()
              );
            }
            if (
@@ -327,7 +353,7 @@ namespace gdjs {
              AnchorRuntimeBehavior.HorizontalAnchor.NONE
            ) {
              this.owner.setX(
-                bottomRightCoord[0] +
+                right +
                  this.owner.getX() -
                  this.owner.getDrawableX() -
                  this.owner.getWidth()
@@ -340,14 +366,14 @@ namespace gdjs {
              AnchorRuntimeBehavior.VerticalAnchor.NONE &&
            this._topEdgeAnchor !== AnchorRuntimeBehavior.VerticalAnchor.NONE
          ) {
-            this.owner.setHeight(bottomRightCoord[1] - topLeftCoord[1]);
-            this.owner.setY(topLeftCoord[1]);
+            this.owner.setHeight(bottom - top);
+            this.owner.setY(top);
          } else {
            if (
              this._topEdgeAnchor !== AnchorRuntimeBehavior.VerticalAnchor.NONE
            ) {
              this.owner.setY(
-                topLeftCoord[1] + this.owner.getY() - this.owner.getDrawableY()
+                top + this.owner.getY() - this.owner.getDrawableY()
              );
            }
            if (
@@ -355,7 +381,7 @@ namespace gdjs {
              AnchorRuntimeBehavior.VerticalAnchor.NONE
            ) {
              this.owner.setY(
-                bottomRightCoord[1] +
+                bottom +
                  this.owner.getY() -
                  this.owner.getDrawableY() -
                  this.owner.getHeight()
@@ -366,7 +392,7 @@ namespace gdjs {
      }
    }

-    doStepPostEvents(runtimeScene) {}
+    doStepPostEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {}

    static HorizontalAnchor = {
      NONE: 0,
--- a/Extensions/BBText/JsExtension.js
+++ b/Extensions/BBText/JsExtension.js
@@ -33,7 +33,10 @@ module.exports = {
        'Todor Imreorov',
        'Open source (MIT License)'
      )
-      .setExtensionHelpPath('/objects/bbtext');
+      .setExtensionHelpPath('/objects/bbtext')
+      .setCategory('User interface');
+    extension.addInstructionOrExpressionGroupMetadata(_("BBCode Text Object"))
+        .setIcon("JsPlatform/Extensions/bbcode32.png");

    var objectBBText = new gd.ObjectJsImplementation();
    // $FlowExpectedError
@@ -168,7 +171,7 @@ module.exports = {
      .addIncludeFile(
        'Extensions/BBText/pixi-multistyle-text/dist/pixi-multistyle-text.umd.js'
      )
-      .setCategoryFullName(_('Texts'));
+      .setCategoryFullName(_('User interface'));

    /**
     * Utility function to add both a setter and a getter to a property from a list.
@@ -289,7 +292,7 @@ module.exports = {
    const setterAndGetterProperties = [
      {
        functionName: 'BBText',
-        iconPath: 'res/actions/text24.png',
+        iconPath: 'res/actions/text24_black.png',
        type: 'string',
        paramLabel: _('BBCode text'),
        conditionDescription: _('Compare the value of the BBCode text.'),
@@ -364,7 +367,7 @@ module.exports = {
      },
      {
        functionName: 'WordWrap',
-        iconPath: 'res/actions/scaleWidth24.png',
+        iconPath: 'res/actions/scaleWidth24_black.png',
        type: 'boolean',
        paramLabel: _('Word wrap'),
        conditionDescription: _('Check if word wrap is enabled.'),
@@ -376,7 +379,7 @@ module.exports = {
      },
      {
        functionName: 'WrappingWidth',
-        iconPath: 'res/actions/scaleWidth24.png',
+        iconPath: 'res/actions/scaleWidth24_black.png',
        type: 'number',
        paramLabel: _('Wrapping width'),
        conditionDescription: _(
@@ -454,7 +457,7 @@ module.exports = {
      project,
      layout,
      instance,
-      associatedObject,
+      associatedObjectConfiguration,
      pixiContainer,
      pixiResourcesLoader
    ) {
@@ -463,7 +466,7 @@ module.exports = {
        project,
        layout,
        instance,
-        associatedObject,
+        associatedObjectConfiguration,
        pixiContainer,
        pixiResourcesLoader
      );
@@ -498,7 +501,7 @@ module.exports = {
    RenderedBBTextInstance.getThumbnail = function (
      project,
      resourcesLoader,
-      object
+      objectConfiguration
    ) {
      return 'JsPlatform/Extensions/bbcode24.png';
    };
@@ -507,7 +510,8 @@ module.exports = {
     * This is called to update the PIXI object on the scene editor
     */
    RenderedBBTextInstance.prototype.update = function () {
-      const properties = this._associatedObject.getProperties();
+      const properties = this._associatedObjectConfiguration
+        .getProperties();

      const rawText = properties.get('text').getValue();
      if (rawText !== this._pixiObject.text) {
--- a/Extensions/BBText/bbtextruntimeobject-pixi-renderer.ts
+++ b/Extensions/BBText/bbtextruntimeobject-pixi-renderer.ts
@@ -10,11 +10,11 @@ namespace gdjs {

    /**
     * @param runtimeObject The object to render
-     * @param runtimeScene The gdjs.RuntimeScene in which the object is
+     * @param instanceContainer The gdjs.RuntimeInstanceContainer in which the object is
     */
    constructor(
      runtimeObject: gdjs.BBTextRuntimeObject,
-      runtimeScene: gdjs.RuntimeScene
+      instanceContainer: gdjs.RuntimeInstanceContainer
    ) {
      this._object = runtimeObject;

@@ -22,7 +22,7 @@ namespace gdjs {
      if (this._pixiObject === undefined) {
        this._pixiObject = new MultiStyleText(runtimeObject._text, {
          default: {
-            fontFamily: runtimeScene
+            fontFamily: instanceContainer
              .getGame()
              .getFontManager()
              .getFontFamily(runtimeObject._fontFamily),
@@ -44,7 +44,7 @@ namespace gdjs {
        this.updateFontFamily();
        this.updateFontSize();
      }
-      runtimeScene
+      instanceContainer
        .getLayer('')
        .getRenderer()
        .addRendererObject(this._pixiObject, runtimeObject.getZOrder());
@@ -95,7 +95,8 @@ namespace gdjs {
    }

    updateFontFamily(): void {
-      this._pixiObject.textStyles.default.fontFamily = this._object._runtimeScene
+      this._pixiObject.textStyles.default.fontFamily = this._object
+        .getInstanceContainer()
        .getGame()
        .getFontManager()
        .getFontFamily(this._object._fontFamily);
--- a/Show More
+++ b/Show More