diff --git a/jerry-core/api/jerry.c b/jerry-core/api/jerry.c
index bcc9b69ad..bb3a95323 100644
--- a/jerry-core/api/jerry.c
+++ b/jerry-core/api/jerry.c
@@ -1715,18 +1715,16 @@ jerry_iterator_get_type (const jerry_value_t value) /**< input value to check */
         {
           return JERRY_ITERATOR_TYPE_ARRAY;
         }
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
         case ECMA_OBJECT_CLASS_SET_ITERATOR:
         {
           return JERRY_ITERATOR_TYPE_SET;
         }
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_MAP
         case ECMA_OBJECT_CLASS_MAP_ITERATOR:
         {
           return JERRY_ITERATOR_TYPE_MAP;
         }
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
         case ECMA_OBJECT_CLASS_STRING_ITERATOR:
         {
           return JERRY_ITERATOR_TYPE_STRING;
@@ -1820,21 +1818,15 @@ jerry_is_feature_enabled (const jerry_feature_t feature) /**< feature to check *
 #if JERRY_BUILTIN_GLOBAL_THIS
           || feature == JERRY_FEATURE_GLOBAL_THIS
 #endif /* JERRY_BUILTIN_GLOBAL_THIS */
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
           || feature == JERRY_FEATURE_MAP
-#endif /* JERRY_BUILTIN_MAP */
-#if JERRY_BUILTIN_SET
           || feature == JERRY_FEATURE_SET
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_WEAKMAP
           || feature == JERRY_FEATURE_WEAKMAP
-#endif /* JERRY_BUILTIN_WEAKMAP */
+          || feature == JERRY_FEATURE_WEAKSET
+#endif /* JERRY_BUILTIN_CONTAINER */
 #if JERRY_BUILTIN_WEAKREF
           || feature == JERRY_FEATURE_WEAKREF
 #endif /* JERRY_BUILTIN_WEAKREF */
-#if JERRY_BUILTIN_WEAKSET
-          || feature == JERRY_FEATURE_WEAKSET
-#endif /* JERRY_BUILTIN_WEAKSET */
 #if JERRY_BUILTIN_BIGINT
           || feature == JERRY_FEATURE_BIGINT
 #endif /* JERRY_BUILTIN_BIGINT */
@@ -6372,7 +6364,6 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
 
   switch (container_type)
   {
-#if JERRY_BUILTIN_MAP
     case JERRY_CONTAINER_TYPE_MAP:
     {
       lit_id = LIT_MAGIC_STRING_MAP_UL;
@@ -6380,8 +6371,6 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
       ctor_id = ECMA_BUILTIN_ID_MAP;
       break;
     }
-#endif /* JERRY_BUILTIN_MAP */
-#if JERRY_BUILTIN_SET
     case JERRY_CONTAINER_TYPE_SET:
     {
       lit_id = LIT_MAGIC_STRING_SET_UL;
@@ -6389,8 +6378,6 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
       ctor_id = ECMA_BUILTIN_ID_SET;
       break;
     }
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_WEAKMAP
     case JERRY_CONTAINER_TYPE_WEAKMAP:
     {
       lit_id = LIT_MAGIC_STRING_WEAKMAP_UL;
@@ -6398,8 +6385,6 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
       ctor_id = ECMA_BUILTIN_ID_WEAKMAP;
       break;
     }
-#endif /* JERRY_BUILTIN_WEAKMAP */
-#if JERRY_BUILTIN_WEAKSET
     case JERRY_CONTAINER_TYPE_WEAKSET:
     {
       lit_id = LIT_MAGIC_STRING_WEAKSET_UL;
@@ -6407,7 +6392,6 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
       ctor_id = ECMA_BUILTIN_ID_WEAKSET;
       break;
     }
-#endif /* JERRY_BUILTIN_WEAKSET */
     default:
     {
       return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Invalid container type")));
@@ -6454,30 +6438,22 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object *
     {
       switch (((ecma_extended_object_t *) obj_p)->u.cls.u2.container_id)
       {
-#if JERRY_BUILTIN_MAP
         case LIT_MAGIC_STRING_MAP_UL:
         {
           return JERRY_CONTAINER_TYPE_MAP;
         }
-#endif /* JERRY_BUILTIN_MAP */
-#if JERRY_BUILTIN_SET
         case LIT_MAGIC_STRING_SET_UL:
         {
           return JERRY_CONTAINER_TYPE_SET;
         }
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_WEAKMAP
         case LIT_MAGIC_STRING_WEAKMAP_UL:
         {
           return JERRY_CONTAINER_TYPE_WEAKMAP;
         }
-#endif /* JERRY_BUILTIN_WEAKMAP */
-#if JERRY_BUILTIN_WEAKSET
         case LIT_MAGIC_STRING_WEAKSET_UL:
         {
           return JERRY_CONTAINER_TYPE_WEAKSET;
         }
-#endif /* JERRY_BUILTIN_WEAKSET */
         default:
         {
           return JERRY_CONTAINER_TYPE_INVALID;
diff --git a/jerry-core/config.h b/jerry-core/config.h
index b0ac43587..9c893c406 100644
--- a/jerry-core/config.h
+++ b/jerry-core/config.h
@@ -83,6 +83,10 @@
 # define JERRY_BUILTIN_BIGINT JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_BIGINT) */
 
+#ifndef JERRY_BUILTIN_CONTAINER
+# define JERRY_BUILTIN_CONTAINER JERRY_ESNEXT
+#endif /* !defined (JERRY_BUILTIN_CONTAINER) */
+
 #ifndef JERRY_BUILTIN_DATAVIEW
 # define JERRY_BUILTIN_DATAVIEW JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_DATAVIEW) */
@@ -91,10 +95,6 @@
 # define JERRY_BUILTIN_GLOBAL_THIS JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_GLOBAL_THIS) */
 
-#ifndef JERRY_BUILTIN_MAP
-# define JERRY_BUILTIN_MAP JERRY_ESNEXT
-#endif /* !defined (JERRY_BUILTIN_MAP) */
-
 #ifndef JERRY_BUILTIN_PROMISE
 # define JERRY_BUILTIN_PROMISE JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_PROMISE) */
@@ -111,26 +111,14 @@
 # define JERRY_BUILTIN_REFLECT JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_REFLECT) */
 
-#ifndef JERRY_BUILTIN_SET
-# define JERRY_BUILTIN_SET JERRY_ESNEXT
-#endif /* !defined (JERRY_BUILTIN_SET) */
-
 #ifndef JERRY_BUILTIN_TYPEDARRAY
 # define JERRY_BUILTIN_TYPEDARRAY JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_TYPEDARRAY) */
 
-#ifndef JERRY_BUILTIN_WEAKMAP
-# define JERRY_BUILTIN_WEAKMAP JERRY_ESNEXT
-#endif /* !defined (JERRY_BUILTIN_WEAKMAP) */
-
 #ifndef JERRY_BUILTIN_WEAKREF
 # define JERRY_BUILTIN_WEAKREF JERRY_ESNEXT
 #endif /* !defined (JERRY_BUILTIN_WEAKREF) */
 
-#ifndef JERRY_BUILTIN_WEAKSET
-# define JERRY_BUILTIN_WEAKSET JERRY_ESNEXT
-#endif /* !defined (JERRY_BUILTIN_WEAKSET) */
-
 #ifndef JERRY_MODULE_SYSTEM
 # define JERRY_MODULE_SYSTEM JERRY_ESNEXT
 #endif /* !defined (JERRY_MODULE_SYSTEM) */
@@ -556,30 +544,14 @@
 || ((JERRY_BUILTIN_GLOBAL_THIS != 0) && (JERRY_BUILTIN_GLOBAL_THIS != 1))
 # error "Invalid value for JERRY_BUILTIN_GLOBAL_THIS macro."
 #endif /* !defined (JERRY_BUILTIN_GLOBAL_THIS) */
-#if !defined (JERRY_BUILTIN_MAP) \
-|| ((JERRY_BUILTIN_MAP != 0) && (JERRY_BUILTIN_MAP != 1))
-# error "Invalid value for JERRY_BUILTIN_MAP macro."
-#endif
 #if !defined (JERRY_BUILTIN_REFLECT) \
 || ((JERRY_BUILTIN_REFLECT != 0) && (JERRY_BUILTIN_REFLECT != 1))
 # error "Invalid value for JERRY_BUILTIN_REFLECT macro."
 #endif
-#if !defined (JERRY_BUILTIN_SET) \
-|| ((JERRY_BUILTIN_SET != 0) && (JERRY_BUILTIN_SET != 1))
-# error "Invalid value for JERRY_BUILTIN_SET macro."
-#endif
-#if !defined (JERRY_BUILTIN_WEAKMAP) \
-|| ((JERRY_BUILTIN_WEAKMAP != 0) && (JERRY_BUILTIN_WEAKMAP != 1))
-# error "Invalid value for JERRY_BUILTIN_WEAKMAP macro."
-#endif
 #if !defined (JERRY_BUILTIN_WEAKREF) \
 || ((JERRY_BUILTIN_WEAKREF != 0) && (JERRY_BUILTIN_WEAKREF != 1))
 # error "Invalid value for JERRY_BUILTIN_WEAKREF macro."
 #endif
-#if !defined (JERRY_BUILTIN_WEAKSET) \
-|| ((JERRY_BUILTIN_WEAKSET != 0) && (JERRY_BUILTIN_WEAKSET != 1))
-# error "Invalid value for JERRY_BUILTIN_WEAKSET macro."
-#endif
 #if !defined (JERRY_BUILTIN_PROMISE) \
 || ((JERRY_BUILTIN_PROMISE != 0) && (JERRY_BUILTIN_PROMISE != 1))
 # error "Invalid value for JERRY_BUILTIN_PROMISE macro."
@@ -602,16 +574,13 @@
 #endif
 #if (JERRY_ESNEXT == 0) \
 && ((JERRY_BUILTIN_DATAVIEW == 1) \
-|| (JERRY_BUILTIN_MAP == 1) \
-|| (JERRY_BUILTIN_SET == 1) \
-|| (JERRY_BUILTIN_WEAKMAP == 1) \
-|| (JERRY_BUILTIN_WEAKREF == 1) \
-|| (JERRY_BUILTIN_WEAKSET == 1) \
+|| (JERRY_BUILTIN_CONTAINER == 1) \
 || (JERRY_BUILTIN_PROMISE == 1) \
 || (JERRY_BUILTIN_PROXY == 1) \
 || (JERRY_BUILTIN_REFLECT == 1) \
 || (JERRY_BUILTIN_PROMISE == 1) \
-|| (JERRY_BUILTIN_TYPEDARRAY == 1))
+|| (JERRY_BUILTIN_TYPEDARRAY == 1) \
+|| (JERRY_BUILTIN_WEAKREF == 1))
 # error "JERRY_ESNEXT should be enabled too to enable JERRY_BUILTIN_xxxxx macro."
 #endif
 #if (JERRY_ESNEXT == 0) && (JERRY_MODULE_SYSTEM == 1)
@@ -740,16 +709,6 @@
 #  error "Promise callback support depends on Promise support"
 #endif /* JERRY_PROMISE_CALLBACK && !JERRY_BUILTIN_PROMISE */
 
-/**
- * Wrap container types into a single guard
- */
-#if JERRY_BUILTIN_MAP || JERRY_BUILTIN_SET \
-|| JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET
-# define JERRY_BUILTIN_CONTAINER 1
-#else
-# define JERRY_BUILTIN_CONTAINER 0
-#endif
-
 /**
  * Resource name related types into a single guard
  */
diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c
index 5e9db8476..d9376213c 100644
--- a/jerry-core/ecma/base/ecma-gc.c
+++ b/jerry-core/ecma/base/ecma-gc.c
@@ -327,7 +327,7 @@ ecma_gc_mark_properties (ecma_object_t *object_p, /**< object */
           break;
         }
 #endif /* JERRY_ESNEXT */
-#if JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_CONTAINER
         case LIT_INTERNAL_MAGIC_STRING_WEAK_REFS:
         {
           ecma_value_t key_arg = ecma_make_object_value (object_p);
@@ -366,7 +366,7 @@ ecma_gc_mark_properties (ecma_object_t *object_p, /**< object */
           }
           break;
         }
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
         case LIT_INTERNAL_MAGIC_STRING_NATIVE_POINTER_WITH_REFERENCES:
         {
           jerry_value_t value = property_pair_p->values[index].value;
@@ -505,7 +505,7 @@ ecma_gc_mark_promise_object (ecma_extended_object_t *ext_object_p) /**< extended
 
 #endif /* JERRY_BUILTIN_PROMISE */
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 /**
  * Mark objects referenced by Map built-in.
  */
@@ -540,9 +540,7 @@ ecma_gc_mark_map_object (ecma_object_t *object_p) /**< object */
     }
   }
 } /* ecma_gc_mark_map_object */
-#endif /* JERRY_BUILTIN_MAP */
 
-#if JERRY_BUILTIN_WEAKMAP
 /**
  * Mark objects referenced by WeakMap built-in.
  */
@@ -575,9 +573,7 @@ ecma_gc_mark_weakmap_object (ecma_object_t *object_p) /**< object */
     }
   }
 } /* ecma_gc_mark_weakmap_object */
-#endif /* JERRY_BUILTIN_WEAKMAP */
 
-#if JERRY_BUILTIN_SET
 /**
  * Mark objects referenced by Set built-in.
  */
@@ -607,7 +603,7 @@ ecma_gc_mark_set_object (ecma_object_t *object_p) /**< object */
     }
   }
 } /* ecma_gc_mark_set_object */
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #if JERRY_ESNEXT
 /**
@@ -939,30 +935,22 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */
 #if JERRY_BUILTIN_CONTAINER
           case ECMA_OBJECT_CLASS_CONTAINER:
           {
-#if JERRY_BUILTIN_MAP
             if (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_MAP_UL)
             {
               ecma_gc_mark_map_object (object_p);
               break;
             }
-#endif /* JERRY_BUILTIN_MAP */
-#if JERRY_BUILTIN_WEAKMAP
             if (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_WEAKMAP_UL)
             {
               ecma_gc_mark_weakmap_object (object_p);
               break;
             }
-#endif /* JERRY_BUILTIN_WEAKMAP */
-#if JERRY_BUILTIN_SET
             if (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_SET_UL)
             {
               ecma_gc_mark_set_object (object_p);
               break;
             }
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_WEAKSET
             JERRY_ASSERT (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_WEAKSET_UL);
-#endif /* JERRY_BUILTIN_WEAKSET */
             break;
           }
 #endif /* JERRY_BUILTIN_CONTAINER */
@@ -1567,7 +1555,7 @@ ecma_gc_free_property (ecma_object_t *object_p, /**< object */
       break;
     }
 #endif /* JERRY_ESNEXT */
-#if JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET || JERRY_BUILTIN_WEAKREF
+#if JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_CONTAINER
     case LIT_INTERNAL_MAGIC_STRING_WEAK_REFS:
     {
       ecma_collection_t *refs_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, value);
@@ -1592,7 +1580,7 @@ ecma_gc_free_property (ecma_object_t *object_p, /**< object */
       ecma_collection_destroy (refs_p);
       break;
     }
-#endif /* JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET || JERRY_BUILTIN_WEAKREF */
+#endif /* JERRY_BUILTIN_CONTAINER */
     default:
     {
       JERRY_ASSERT (name_cp == LIT_INTERNAL_MAGIC_STRING_NATIVE_POINTER
diff --git a/jerry-core/ecma/base/ecma-helpers.h b/jerry-core/ecma/base/ecma-helpers.h
index e5187e0b3..e3276fea3 100644
--- a/jerry-core/ecma/base/ecma-helpers.h
+++ b/jerry-core/ecma/base/ecma-helpers.h
@@ -295,10 +295,10 @@ ecma_string_t *ecma_new_symbol_from_descriptor_string (ecma_value_t string_desc)
 bool ecma_prop_name_is_symbol (ecma_string_t *string_p);
 ecma_length_t ecma_op_advance_string_index (ecma_string_t *str_p, ecma_length_t index_num, bool is_unicode);
 #endif /* JERRY_ESNEXT */
-#if JERRY_BUILTIN_MAP || JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 ecma_string_t *ecma_new_map_key_string (ecma_value_t value);
 bool ecma_prop_name_is_map_key (ecma_string_t *string_p);
-#endif /* JERRY_BUILTIN_MAP || JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 ecma_string_t *ecma_new_ecma_string_from_utf8 (const lit_utf8_byte_t *string_p, lit_utf8_size_t string_size);
 ecma_string_t *ecma_new_ecma_string_from_utf8_converted_to_cesu8 (const lit_utf8_byte_t *string_p,
                                                                   lit_utf8_size_t string_size);
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
index b4c93832a..eac4e0261 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
@@ -220,26 +220,27 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 #endif /* JERRY_BUILTIN_PROMISE */
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
+/* ECMA-262 v6, 23.1.1.1 */
+OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL,
+              ECMA_BUILTIN_ID_WEAKSET,
+              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
+
 /* ECMA-262 v6, 23.1.1.1 */
 OBJECT_VALUE (LIT_MAGIC_STRING_MAP_UL,
               ECMA_BUILTIN_ID_MAP,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* JERRY_BUILTIN_MAP */
 
-#if JERRY_BUILTIN_SET
 /* ECMA-262 v6, 23.1.1.1 */
 OBJECT_VALUE (LIT_MAGIC_STRING_SET_UL,
               ECMA_BUILTIN_ID_SET,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* JERRY_BUILTIN_SET */
 
-#if JERRY_BUILTIN_WEAKMAP
 /* ECMA-262 v6, 23.1.1.1 */
 OBJECT_VALUE (LIT_MAGIC_STRING_WEAKMAP_UL,
               ECMA_BUILTIN_ID_WEAKMAP,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #if JERRY_BUILTIN_WEAKREF
 OBJECT_VALUE (LIT_MAGIC_STRING_WEAKREF_UL,
@@ -247,13 +248,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_WEAKREF_UL,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 #endif /* JERRY_BUILTIN_WEAKREF */
 
-#if JERRY_BUILTIN_WEAKSET
-/* ECMA-262 v6, 23.1.1.1 */
-OBJECT_VALUE (LIT_MAGIC_STRING_WEAKSET_UL,
-              ECMA_BUILTIN_ID_WEAKSET,
-              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* JERRY_BUILTIN_WEAKSET */
-
 #if JERRY_ESNEXT
 /* ECMA-262 v6, 19.4.1.1 */
 OBJECT_VALUE (LIT_MAGIC_STRING_SYMBOL_UL,
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c
index d44000436..e8addacff 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.c
@@ -17,7 +17,7 @@
 #include "ecma-builtins.h"
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -60,4 +60,4 @@ ecma_builtin_map_iterator_prototype_object_next (ecma_value_t this_val) /**< thi
  * @}
  */
 
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h
index 955e01c78..377e381f6 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG,
               LIT_MAGIC_STRING_MAP_ITERATOR_UL,
@@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG,
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
 ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_map_iterator_prototype_object_next, 0, 0)
 
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c
index 768dea1d2..45d9329df 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.c
@@ -15,7 +15,7 @@
 
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -63,4 +63,4 @@ ecma_builtin_map_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< bu
  * @}
  */
 
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
index ad8f723f0..6d99f667d 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 /* Object properties:
  *  (property name, object pointer getter) */
@@ -54,6 +54,6 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE,
                     ECMA_CONTAINER_ROUTINE_SIZE_GETTER,
                     ECMA_PROPERTY_FLAG_CONFIGURABLE)
 
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c
index bbba9a7cf..215e2cc46 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.c
@@ -17,7 +17,7 @@
 #include "ecma-exceptions.h"
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -83,4 +83,4 @@ ecma_builtin_map_species_get (ecma_value_t this_value) /**< This Value */
  * @}
  */
 
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h
index df9bb8be9..5cf091d4f 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 /* Number properties:
  *  (property name, number value, writable, enumerable, configurable) */
@@ -47,6 +47,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES,
                     ecma_builtin_map_species_get,
                     ECMA_PROPERTY_FLAG_CONFIGURABLE)
 
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c
index e62e19ab6..540c84993 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.c
@@ -17,7 +17,7 @@
 #include "ecma-builtins.h"
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -60,4 +60,4 @@ ecma_builtin_set_iterator_prototype_object_next (ecma_value_t this_val) /**< thi
  * @}
  */
 
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h
index 3c590d2c1..59430f162 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 
 STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG,
               LIT_MAGIC_STRING_SET_ITERATOR_UL,
@@ -29,6 +29,6 @@ STRING_VALUE (LIT_GLOBAL_SYMBOL_TO_STRING_TAG,
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
 ROUTINE (LIT_MAGIC_STRING_NEXT, ecma_builtin_set_iterator_prototype_object_next, 0, 0)
 
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c
index 24d3f2549..3f596bda3 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.c
@@ -15,7 +15,7 @@
 
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -62,4 +62,4 @@ ecma_builtin_set_prototype_dispatch_routine (uint8_t builtin_routine_id, /**< bu
  * @}
  */
 
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h
index 8d0d6f0c2..1c819a139 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set-prototype.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 
 /* Object properties:
  *  (property name, object pointer getter) */
@@ -53,6 +53,6 @@ ACCESSOR_READ_ONLY (LIT_MAGIC_STRING_SIZE,
                     ECMA_CONTAINER_ROUTINE_SIZE_GETTER,
                     ECMA_PROPERTY_FLAG_CONFIGURABLE)
 
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c
index 66c0ef9a4..5bc8fcc0e 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.c
@@ -17,7 +17,7 @@
 #include "ecma-exceptions.h"
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -83,4 +83,4 @@ ecma_builtin_set_species_get (ecma_value_t this_value) /**< This Value */
  * @}
  */
 
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h
index 99dcf3049..0d2a7d718 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-set.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 
 /* Number properties:
  *  (property name, number value, writable, enumerable, configurable) */
@@ -47,6 +47,6 @@ ACCESSOR_READ_ONLY (LIT_GLOBAL_SYMBOL_SPECIES,
                     ecma_builtin_set_species_get,
                     ECMA_PROPERTY_FLAG_CONFIGURABLE)
 
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c
index 8bc364b1c..d522e9daf 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.c
@@ -15,7 +15,7 @@
 
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -62,4 +62,4 @@ ecma_builtin_weakmap_prototype_dispatch_routine (uint8_t builtin_routine_id, /**
  * @}
  */
 
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h
index c0333f6f9..d2c1acc63 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_CONTAINER
 
 /* Object properties:
  *  (property name, object pointer getter) */
@@ -41,6 +41,6 @@ ROUTINE (LIT_MAGIC_STRING_GET, ECMA_CONTAINER_ROUTINE_GET, 1, 1)
 ROUTINE (LIT_MAGIC_STRING_HAS, ECMA_CONTAINER_ROUTINE_HAS, 1, 1)
 ROUTINE (LIT_MAGIC_STRING_SET, ECMA_CONTAINER_ROUTINE_SET, 2, 2)
 
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c
index 326835f71..7496e3350 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.c
@@ -17,7 +17,7 @@
 #include "ecma-exceptions.h"
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -71,4 +71,4 @@ ecma_builtin_weakmap_dispatch_construct (const ecma_value_t *arguments_list_p, /
  * @}
  */
 
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h
index 52d938359..141b18240 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakmap.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_CONTAINER
 
 /* Number properties:
  *  (property name, number value, writable, enumerable, configurable) */
@@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE,
               ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE,
               ECMA_PROPERTY_FIXED)
 
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c
index ec59b676f..c1232d421 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.c
@@ -15,7 +15,7 @@
 
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -64,4 +64,4 @@ ecma_builtin_weakset_prototype_dispatch_routine (uint8_t builtin_routine_id, /**
  * @}
  */
 
-#endif /* JERRY_BUILTIN_WEAKSET */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h
index b03502f40..6c2033338 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 
 /* Object properties:
  *  (property name, object pointer getter) */
@@ -40,6 +40,6 @@ ROUTINE (LIT_MAGIC_STRING_ADD, ECMA_CONTAINER_ROUTINE_ADD, 1, 1)
 ROUTINE (LIT_MAGIC_STRING_DELETE, ECMA_CONTAINER_ROUTINE_DELETE_WEAK, 1, 1)
 ROUTINE (LIT_MAGIC_STRING_HAS, ECMA_CONTAINER_ROUTINE_HAS, 1, 1)
 
-#endif /* JERRY_BUILTIN_WEAKSET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c
index a854c235e..d96790dd3 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.c
@@ -17,7 +17,7 @@
 #include "ecma-exceptions.h"
 #include "ecma-container-object.h"
 
-#if JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -71,4 +71,4 @@ ecma_builtin_weakset_dispatch_construct (const ecma_value_t *arguments_list_p, /
  * @}
  */
 
-#endif /* JERRY_BUILTIN_WEAKSET */
+#endif /* JERRY_BUILTIN_CONTAINER */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h
index e5753012e..d9331786e 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-weakset.inc.h
@@ -19,7 +19,7 @@
 
 #include "ecma-builtin-helpers-macro-defines.inc.h"
 
-#if JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 
 /* Number properties:
  *  (property name, number value, writable, enumerable, configurable) */
@@ -42,6 +42,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROTOTYPE,
               ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE,
               ECMA_PROPERTY_FIXED)
 
-#endif /* JERRY_BUILTIN_WEAKSET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #include "ecma-builtin-helpers-macro-undefs.inc.h"
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
index c94cbbc5c..65e742708 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
@@ -509,7 +509,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_PROMISE,
 
 #endif /* JERRY_BUILTIN_PROMISE */
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 
 /* The Map prototype object (23.1.3) */
 BUILTIN (ECMA_BUILTIN_ID_MAP_PROTOTYPE,
@@ -525,10 +525,6 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_MAP,
                  true,
                  map)
 
-#endif /* JERRY_BUILTIN_MAP */
-
-#if JERRY_BUILTIN_SET
-
 /* The Set prototype object (23.1.3) */
 BUILTIN (ECMA_BUILTIN_ID_SET_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,
@@ -543,10 +539,6 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_SET,
                  true,
                  set)
 
-#endif /* JERRY_BUILTIN_SET */
-
-#if JERRY_BUILTIN_WEAKMAP
-
 /* The WeakMap prototype object (23.1.3) */
 BUILTIN (ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,
@@ -561,10 +553,6 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_WEAKMAP,
                  true,
                  weakmap)
 
-#endif /* JERRY_BUILTIN_WEAKMAP */
-
-#if JERRY_BUILTIN_WEAKSET
-
 /* The WeakSet prototype object (23.1.3) */
 BUILTIN (ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,
@@ -579,7 +567,7 @@ BUILTIN_ROUTINE (ECMA_BUILTIN_ID_WEAKSET,
                  true,
                  weakset)
 
-#endif /* JERRY_BUILTIN_WEAKSET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #if JERRY_BUILTIN_WEAKREF
 
@@ -729,23 +717,21 @@ BUILTIN (ECMA_BUILTIN_ID_ASYNC_GENERATOR_PROTOTYPE,
          true,
          async_generator_prototype)
 
-#if JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 /* The %SetIteratorPrototype% object (ECMA-262 v6, 23.2.5.2) */
 BUILTIN (ECMA_BUILTIN_ID_SET_ITERATOR_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,
          ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE,
          true,
          set_iterator_prototype)
-#endif /* JERRY_BUILTIN_SET */
 
-#if JERRY_BUILTIN_MAP
 /* The %MapIteratorPrototype% object (ECMA-262 v6, 23.1.5.2) */
 BUILTIN (ECMA_BUILTIN_ID_MAP_ITERATOR_PROTOTYPE,
          ECMA_OBJECT_TYPE_GENERAL,
          ECMA_BUILTIN_ID_ITERATOR_PROTOTYPE,
          true,
          map_iterator_prototype)
-#endif /* JERRY_BUILTIN_SET */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 #endif /* JERRY_ESNEXT */
 
diff --git a/jerry-core/ecma/operations/ecma-container-object.c b/jerry-core/ecma/operations/ecma-container-object.c
index 50c4ed0da..8bbe84661 100644
--- a/jerry-core/ecma/operations/ecma-container-object.c
+++ b/jerry-core/ecma/operations/ecma-container-object.c
@@ -184,7 +184,6 @@ ecma_op_container_entry_size (lit_magic_string_id_t lit_id) /**< class id */
   return ECMA_CONTAINER_VALUE_SIZE;
 } /* ecma_op_container_entry_size */
 
-#if JERRY_BUILTIN_WEAKSET
 /**
  * Release the entries in the WeakSet container.
  */
@@ -213,9 +212,7 @@ ecma_op_container_free_weakset_entries (ecma_object_t *object_p, /**< object poi
     *entry_p = ECMA_VALUE_EMPTY;
   }
 } /* ecma_op_container_free_weakset_entries */
-#endif /* JERRY_BUILTIN_WEAKSET */
 
-#if JERRY_BUILTIN_WEAKMAP
 /**
  * Release the entries in the WeakMap container.
  */
@@ -247,9 +244,7 @@ ecma_op_container_free_weakmap_entries (ecma_object_t *object_p, /**< object poi
     entry_p->value = ECMA_VALUE_EMPTY;
   }
 } /* ecma_op_container_free_weakmap_entries */
-#endif /* JERRY_BUILTIN_WEAKMAP */
 
-#if JERRY_BUILTIN_SET
 /**
  * Release the entries in the Set container.
  */
@@ -274,9 +269,7 @@ ecma_op_container_free_set_entries (ecma_collection_t *container_p)
     *entry_p = ECMA_VALUE_EMPTY;
   }
 } /* ecma_op_container_free_set_entries */
-#endif /* JERRY_BUILTIN_SET */
 
-#if JERRY_BUILTIN_MAP
 /**
  * Release the entries in the Map container.
  */
@@ -304,7 +297,6 @@ ecma_op_container_free_map_entries (ecma_collection_t *container_p)
     entry_p->value = ECMA_VALUE_EMPTY;
   }
 } /* ecma_op_container_free_map_entries */
-#endif /* JERRY_BUILTIN_MAP */
 
 /**
  * Release the internal buffer and the stored entries.
@@ -320,34 +312,26 @@ ecma_op_container_free_entries (ecma_object_t *object_p) /**< collection object
 
   switch (map_object_p->u.cls.u2.container_id)
   {
-#if JERRY_BUILTIN_WEAKSET
     case LIT_MAGIC_STRING_WEAKSET_UL:
     {
       ecma_op_container_free_weakset_entries (object_p, container_p);
       break;
     }
-#endif /* JERRY_BUILTIN_WEAKSET */
-#if JERRY_BUILTIN_WEAKMAP
     case LIT_MAGIC_STRING_WEAKMAP_UL:
     {
       ecma_op_container_free_weakmap_entries (object_p, container_p);
       break;
     }
-#endif /* JERRY_BUILTIN_WEAKMAP */
-#if JERRY_BUILTIN_SET
     case LIT_MAGIC_STRING_SET_UL:
     {
       ecma_op_container_free_set_entries (container_p);
       break;
     }
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_MAP
     case LIT_MAGIC_STRING_MAP_UL:
     {
       ecma_op_container_free_map_entries (container_p);
       break;
     }
-#endif /* JERRY_BUILTIN_MAP */
     default:
     {
       break;
@@ -610,12 +594,10 @@ ecma_op_container_get (ecma_extended_object_t *map_object_p, /**< map object */
                        ecma_value_t key_arg, /**< key argument */
                        lit_magic_string_id_t lit_id) /**< internal class id */
 {
-#if JERRY_BUILTIN_WEAKMAP
   if (lit_id == LIT_MAGIC_STRING_WEAKMAP_UL && !ecma_is_value_object (key_arg))
   {
     return ECMA_VALUE_UNDEFINED;
   }
-#endif /* JERRY_BUILTIN_WEAKMAP */
 
   ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t,
                                                                     map_object_p->u.cls.u3.value);
@@ -649,13 +631,11 @@ ecma_op_container_has (ecma_extended_object_t *map_object_p, /**< map object */
   ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t,
                                                                     map_object_p->u.cls.u3.value);
 
-#if JERRY_BUILTIN_WEAKMAP || JERRY_BUILTIN_WEAKSET
   if ((map_object_p->u.cls.u1.container_flags & ECMA_CONTAINER_FLAGS_WEAK) != 0
       && !ecma_is_value_object (key_arg))
   {
     return ECMA_VALUE_FALSE;
   }
-#endif /* JERRY_BUILTIN_WEAKMAP ||  JERRY_BUILTIN_WEAKSET */
 
   if (ECMA_CONTAINER_GET_SIZE (container_p) == 0)
   {
@@ -707,13 +687,11 @@ ecma_op_container_set (ecma_extended_object_t *map_object_p, /**< map object */
   ecma_collection_t *container_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t,
                                                                     map_object_p->u.cls.u3.value);
 
-#if JERRY_BUILTIN_WEAKMAP ||  JERRY_BUILTIN_WEAKSET
   if ((map_object_p->u.cls.u1.container_flags & ECMA_CONTAINER_FLAGS_WEAK) != 0
       && !ecma_is_value_object (key_arg))
   {
     return ecma_raise_type_error (ECMA_ERR_MSG ("Key must be an object"));
   }
-#endif /* JERRY_BUILTIN_WEAKMAP ||  JERRY_BUILTIN_WEAKSET */
 
   ecma_value_t *entry_p = ecma_op_internal_buffer_find (container_p, key_arg, lit_id);
 
@@ -724,13 +702,11 @@ ecma_op_container_set (ecma_extended_object_t *map_object_p, /**< map object */
                                     value_arg,
                                     lit_id);
 
-#if JERRY_BUILTIN_WEAKMAP ||  JERRY_BUILTIN_WEAKSET
     if ((map_object_p->u.cls.u1.container_flags & ECMA_CONTAINER_FLAGS_WEAK) != 0)
     {
       ecma_object_t *key_p = ecma_get_object_from_value (key_arg);
       ecma_op_object_set_weak (key_p, (ecma_object_t *) map_object_p);
     }
-#endif /* JERRY_BUILTIN_WEAKMAP ||  JERRY_BUILTIN_WEAKSET */
   }
   else
   {
diff --git a/jerry-core/ecma/operations/ecma-conversion.c b/jerry-core/ecma/operations/ecma-conversion.c
index d7b22c47d..a217d30f2 100644
--- a/jerry-core/ecma/operations/ecma-conversion.c
+++ b/jerry-core/ecma/operations/ecma-conversion.c
@@ -135,7 +135,7 @@ ecma_op_same_value (ecma_value_t x, /**< ecma value */
   return false;
 } /* ecma_op_same_value */
 
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 /**
  * SameValueZero operation.
  *
@@ -182,7 +182,7 @@ ecma_op_same_value_zero (ecma_value_t x, /**< ecma value */
 
   return ecma_op_same_value (x, y);
 } /* ecma_op_same_value_zero */
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 
 /**
  * ToPrimitive operation.
diff --git a/jerry-core/ecma/operations/ecma-conversion.h b/jerry-core/ecma/operations/ecma-conversion.h
index 0e6be3f52..31c58eae1 100644
--- a/jerry-core/ecma/operations/ecma-conversion.h
+++ b/jerry-core/ecma/operations/ecma-conversion.h
@@ -49,9 +49,9 @@ typedef enum
 
 bool ecma_op_require_object_coercible (ecma_value_t value);
 bool ecma_op_same_value (ecma_value_t x, ecma_value_t y);
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
 bool ecma_op_same_value_zero (ecma_value_t x, ecma_value_t y, bool strict_equality);
-#endif /* JERRY_BUILTIN_MAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 ecma_value_t ecma_op_to_primitive (ecma_value_t value, ecma_preferred_type_hint_t preferred_type);
 bool ecma_op_to_boolean (ecma_value_t value);
 ecma_value_t ecma_op_to_number (ecma_value_t value, ecma_number_t *number_p);
diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c
index 1751f507a..a6ddc6952 100644
--- a/jerry-core/ecma/operations/ecma-objects.c
+++ b/jerry-core/ecma/operations/ecma-objects.c
@@ -2796,27 +2796,19 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SYMBOL_PROTOTYPE)
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ASYNC_FUNCTION_PROTOTYPE)
 #endif /* JERRY_ESNEXT */
-#if JERRY_BUILTIN_MAP
+#if JERRY_BUILTIN_CONTAINER
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_MAP_PROTOTYPE)
+          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_PROTOTYPE)
+          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE)
+          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE)
 #if JERRY_ESNEXT
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_MAP_ITERATOR_PROTOTYPE)
-#endif /* JERRY_ESNEXT */
-#endif /* JERRY_BUILTIN_MAP */
-#if JERRY_BUILTIN_SET
-          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_PROTOTYPE)
-#if JERRY_ESNEXT
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_SET_ITERATOR_PROTOTYPE)
 #endif /* JERRY_ESNEXT */
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_WEAKMAP
-          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKMAP_PROTOTYPE)
-#endif /* JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_CONTAINER */
 #if JERRY_BUILTIN_WEAKREF
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKREF_PROTOTYPE)
 #endif /* JERRY_BUILTIN_WEAKREF */
-#if JERRY_BUILTIN_WEAKSET
-          || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_WEAKSET_PROTOTYPE)
-#endif /* JERRY_BUILTIN_WEAKSET */
 #if JERRY_BUILTIN_DATAVIEW
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE)
 #endif /* JERRY_BUILTIN_DATAVIEW */
@@ -3430,7 +3422,7 @@ ecma_op_ordinary_object_has_own_property (ecma_object_t *object_p, /**< the obje
   return property != ECMA_PROPERTY_TYPE_NOT_FOUND && property != ECMA_PROPERTY_TYPE_NOT_FOUND_AND_STOP;
 } /* ecma_op_ordinary_object_has_own_property */
 
-#if JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_WEAKSET || JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_CONTAINER
 
 /**
  * Set a weak reference from a container or WeakRefObject to a key object
@@ -3505,7 +3497,7 @@ ecma_op_object_unref_weak (ecma_object_t *object_p, /**< this argument */
   }
 } /* ecma_op_object_unref_weak */
 
-#endif /* JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_WEAKSET || JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_CONTAINER */
 /**
  * Raise property redefinition error
  *
diff --git a/jerry-core/ecma/operations/ecma-objects.h b/jerry-core/ecma/operations/ecma-objects.h
index 55ee97b6b..26f78352c 100644
--- a/jerry-core/ecma/operations/ecma-objects.h
+++ b/jerry-core/ecma/operations/ecma-objects.h
@@ -111,10 +111,10 @@ ecma_value_t ecma_op_species_constructor (ecma_object_t *this_value, ecma_builti
 ecma_value_t ecma_op_invoke_by_symbol_id (ecma_value_t object, lit_magic_string_id_t magic_string_id,
                                           ecma_value_t *args_p, uint32_t args_len);
 #endif /* JERRY_ESNEXT */
-#if JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_WEAKSET || JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_CONTAINER
 void ecma_op_object_set_weak (ecma_object_t *object_p, ecma_object_t *target_p);
 void ecma_op_object_unref_weak (ecma_object_t *object_p, ecma_value_t ref_holder);
-#endif /* JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_WEAKSET || JERRY_BUILTIN_WEAKMAP */
+#endif /* JERRY_BUILTIN_WEAKREF || JERRY_BUILTIN_CONTAINER */
 ecma_value_t ecma_op_invoke (ecma_value_t object, ecma_string_t *property_name_p, ecma_value_t *args_p,
                              uint32_t args_len);
 ecma_value_t ecma_op_invoke_by_magic_id (ecma_value_t object, lit_magic_string_id_t magic_string_id,
diff --git a/jerry-core/lit/lit-magic-strings.inc.h b/jerry-core/lit/lit-magic-strings.inc.h
index 548a5a219..7f1234dea 100644
--- a/jerry-core/lit/lit-magic-strings.inc.h
+++ b/jerry-core/lit/lit-magic-strings.inc.h
@@ -48,13 +48,11 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_OF, "of")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LN2_U, "LN2")
 #endif
 #if JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_MAP \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_UL, "Map")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAN, "NaN")
 #if JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_SET \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UL, "Set")
 #endif
@@ -64,9 +62,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UTC_U, "UTC")
 #if JERRY_BUILTIN_MATH
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ABS, "abs")
 #endif
-#if JERRY_BUILTIN_CONTAINER && JERRY_ESNEXT \
-|| JERRY_BUILTIN_SET \
-|| JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ADD, "add")
 #endif
 #if JERRY_BUILTIN_PROMISE
@@ -81,12 +77,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_EXP, "exp")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR, "for")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_GET, "get")
-#if JERRY_BUILTIN_MAP \
+#if JERRY_BUILTIN_CONTAINER \
 || JERRY_BUILTIN_PROXY \
-|| JERRY_BUILTIN_REFLECT \
-|| JERRY_BUILTIN_SET \
-|| JERRY_BUILTIN_WEAKMAP \
-|| JERRY_BUILTIN_WEAKSET
+|| JERRY_BUILTIN_REFLECT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_HAS, "has")
 #endif
 #if JERRY_BUILTIN_MATH
@@ -176,8 +169,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_KEYS, "keys")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_LOG2, "log2")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NAME, "name")
-#if JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET \
+#if JERRY_BUILTIN_CONTAINER \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_NEXT, "next")
 #endif
@@ -193,8 +185,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SEAL, "seal")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIGN, "sign")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SINH, "sinh")
 #endif
-#if JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SIZE, "size")
 #endif
 #if JERRY_BUILTIN_ARRAY \
@@ -245,8 +236,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ATANH, "atanh")
 #if JERRY_BUILTIN_PROMISE
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CATCH, "catch")
 #endif
-#if JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET
+#if JERRY_BUILTIN_CONTAINER
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CLEAR, "clear")
 #endif
 #if JERRY_BUILTIN_MATH && JERRY_ESNEXT
@@ -360,10 +350,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CHAR_AT_UL, "charAt")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONCAT, "concat")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CREATE, "create")
-#if JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET \
-|| JERRY_BUILTIN_WEAKMAP \
-|| JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DELETE, "delete")
 #endif
 #if JERRY_BUILTIN_REGEXP && JERRY_ESNEXT
@@ -452,8 +439,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL, "symbol")
 || JERRY_BUILTIN_JSON
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TO_JSON_UL, "toJSON")
 #endif
-#if JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET \
+#if JERRY_BUILTIN_CONTAINER \
 || JERRY_BUILTIN_TYPEDARRAY \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_VALUES, "values")
@@ -474,15 +460,13 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SQRT1_2_U, "SQRT1_2")
 #if JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SYMBOL_DOT_UL, "Symbol.")
 #endif
-#if JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_WEAKMAP
+#if JERRY_BUILTIN_CONTAINER
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKMAP_UL, "WeakMap")
 #endif
 #if JERRY_BUILTIN_WEAKREF
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKREF_UL, "WeakRef")
 #endif
-#if JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_WEAKSET
+#if JERRY_BUILTIN_CONTAINER
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_WEAKSET_UL, "WeakSet")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_BOOLEAN, "boolean")
@@ -493,8 +477,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_COMPILE, "compile")
 || JERRY_MODULE_SYSTEM
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_DEFAULT, "default")
 #endif
-#if JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET \
+#if JERRY_BUILTIN_CONTAINER \
 || JERRY_BUILTIN_TYPEDARRAY \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ENTRIES, "entries")
@@ -506,8 +489,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FINALLY, "finally")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLATMAP, "flatMap")
 #endif
 #if JERRY_BUILTIN_ARRAY \
-|| JERRY_BUILTIN_MAP \
-|| JERRY_BUILTIN_SET \
+|| JERRY_BUILTIN_CONTAINER \
 || JERRY_BUILTIN_TYPEDARRAY
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FOR_EACH_UL, "forEach")
 #endif
@@ -874,12 +856,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_FLOAT64_ARRAY_UL, "Float64Array")
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_INVALID_DATE_UL, "Invalid Date")
 #endif
-#if JERRY_BUILTIN_MAP \
+#if JERRY_BUILTIN_CONTAINER \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MAP_ITERATOR_UL, "Map Iterator")
-#endif
-#if JERRY_BUILTIN_SET \
-|| JERRY_ESNEXT
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_ITERATOR_UL, "Set Iterator")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_CONFIGURABLE, "configurable")
@@ -1046,7 +1025,6 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_OF)
 #elif JERRY_BUILTIN_MATH
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_LN2_U)
 #elif JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_MAP \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (1, LIT_MAGIC_STRING_MAP_UL)
 #else
@@ -1062,7 +1040,6 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_OF)
 #elif JERRY_BUILTIN_MATH
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_LN2_U)
 #elif JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_MAP \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_MAP_UL)
 #else
@@ -1071,7 +1048,6 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (2, LIT_MAGIC_STRING_NAN)
 #if JERRY_BUILTIN_MATH
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_LN2_U)
 #elif JERRY_BUILTIN_CONTAINER \
-|| JERRY_BUILTIN_MAP \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (3, LIT_MAGIC_STRING_MAP_UL)
 #else
@@ -1135,12 +1111,9 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT64_ARRAY_UL)
 #elif JERRY_BUILTIN_DATE \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_INVALID_DATE_UL)
-#elif JERRY_BUILTIN_MAP \
+#elif JERRY_BUILTIN_CONTAINER \
 || JERRY_ESNEXT
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_MAP_ITERATOR_UL)
-#elif JERRY_BUILTIN_SET \
-|| JERRY_ESNEXT
-LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_SET_ITERATOR_UL)
 #else
 LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_CONFIGURABLE)
 #endif
diff --git a/jerry-core/profiles/README.md b/jerry-core/profiles/README.md
index e907b4bcc..c2a21d0f8 100644
--- a/jerry-core/profiles/README.md
+++ b/jerry-core/profiles/README.md
@@ -30,10 +30,9 @@ Alternatively, if you want to use a custom profile at
 
 ```
 # Disable not needed features
+JERRY_BUILTIN_CONTAINER=0
 JERRY_BUILTIN_DATAVIEW=0
-JERRY_BUILTIN_MAP=0
 JERRY_BUILTIN_PROMISE=0
-JERRY_BUILTIN_SET=0
 JERRY_BUILTIN_TYPEDARRAY=0
 ```
 
@@ -100,12 +99,16 @@ defined to `1`.
 
 * `JERRY_BUILTIN_BIGINT`:
   Enables or disables the [BigInt](https://262.ecma-international.org/11.0/#sec-ecmascript-language-types-bigint-type) syntax and built-in.
+* `JERRY_BUILTIN_CONTAINER`:
+  Enables or disables the following built-ins:
+    * [Set](https://www.ecma-international.org/ecma-262/6.0/#sec-set-objects) built-in.
+    * [WeakSet](https://262.ecma-international.org/11.0/#sec-weakmap-objects) built-in.
+    * [Map](http://www.ecma-international.org/ecma-262/6.0/#sec-keyed-collection) built-ins.
+    * [WeakMap](https://262.ecma-international.org/11.0/#sec-weakmap-objects) built-in.
 * `JERRY_BUILTIN_DATAVIEW`:
   Enables or disables the [DataView](https://www.ecma-international.org/ecma-262/6.0/#sec-dataview-objects) built-in.
 * `JERRY_BUILTIN_GLOBAL_THIS`:
   Enables or disables the [GlobalThisValue](https://262.ecma-international.org/11.0/#sec-globalthis) built-in.
-* `JERRY_BUILTIN_MAP`:
-  Enables or disables the [Map](http://www.ecma-international.org/ecma-262/6.0/#sec-keyed-collection) built-ins.
 * `JERRY_BUILTIN_PROMISE`:
   Enables or disables the [Promise](http://www.ecma-international.org/ecma-262/6.0/#sec-promise-objects) built-in.
 * `JERRY_BUILTIN_PROXY`:
@@ -114,14 +117,8 @@ defined to `1`.
   Enables or disables the [Realms](https://262.ecma-international.org/11.0/#sec-code-realms) support in the engine.
 * `JERRY_BUILTIN_REFLECT`:
   Enables or disables the [Reflext](https://262.ecma-international.org/11.0/#sec-reflect-object) built-in.
-* `JERRY_BUILTIN_SET`:
-  Enables or disables the [Set](https://www.ecma-international.org/ecma-262/6.0/#sec-set-objects) built-in.
 * `JERRY_BUILTIN_TYPEDARRAY`:
   Enables or disables the [ArrayBuffer](http://www.ecma-international.org/ecma-262/6.0/#sec-arraybuffer-objects) and [TypedArray](http://www.ecma-international.org/ecma-262/6.0/#sec-typedarray-objects) built-ins.
-* `JERRY_BUILTIN_WEAKMAP`:
-  Enables or disables the [WeakMap](https://262.ecma-international.org/11.0/#sec-weakmap-objects) built-in.
-* `JERRY_BUILTIN_WEAKSET`:
-  Enables or disables the [WeakSet](https://262.ecma-international.org/11.0/#sec-weakmap-objects) built-in.
 * `JERRY_BUILTIN_WEAKREF`:
   Enables or disables the [WeakRef](https://tc39.es/ecma262/#sec-weak-ref-constructor) built-in.
 * `JERRY_MODULE_SYSTEM`:
@@ -150,15 +147,12 @@ defined to `1`.
   This option is evaulated first, any other `JERRY_<name>` defines will override that specific entry.
   Equivalent with setting the following defines to the `JERRY_ESNEXT` value:
     * `JERRY_BUILTIN_BIGINT`
+    * `JERRY_BUILTIN_CONTAINER`
     * `JERRY_BUILTIN_DATAVIEW`
     * `JERRY_BUILTIN_GLOBAL_THIS`
-    * `JERRY_BUILTIN_MAP`
     * `JERRY_BUILTIN_PROMISE`
     * `JERRY_BUILTIN_PROXY`
     * `JERRY_BUILTIN_REALMS`
     * `JERRY_BUILTIN_REFLECT`
-    * `JERRY_BUILTIN_SET`
     * `JERRY_BUILTIN_TYPEDARRAY`
-    * `JERRY_BUILTIN_WEAKMAP`
-    * `JERRY_BUILTIN_WEAKSET`
     * `JERRY_MODULE_SYSTEM`