diff --git a/src/flextype/Foundation/Entries/Fields/CreatedAtField.php b/src/flextype/Foundation/Entries/Fields/CreatedAtField.php
index c78a71141..7470e8b19 100644
--- a/src/flextype/Foundation/Entries/Fields/CreatedAtField.php
+++ b/src/flextype/Foundation/Entries/Fields/CreatedAtField.php
@@ -8,20 +8,22 @@
  */
 
 
-if (flextype('registry')->get('flextype.settings.entries.fields.created_at.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-        if (flextype('entries')->registry()->get('fetch.data.created_at') === null) {
-            flextype('entries')->registry()->set('fetch.data.created_at', (int) filesystem()->file(flextype('entries')->getFileLocation(flextype('entries')->registry()->get('fetch.id')))->lastModified());
+if (registry()->get('flextype.settings.entries.fields.created_at.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+        if (entries()->registry()->get('fetch.data.created_at') === null) {
+            entries()->registry()->set('fetch.data.created_at', (int) filesystem()->file(entries()->getFileLocation(entries()->registry()->get('fetch.id')))->lastModified());
         } else {
-            flextype('entries')->registry()->set('fetch.data.created_at', (int) strtotime((string) flextype('entries')->registry()->get('fetch.data.created_at')));
+            entries()->registry()->set('fetch.data.created_at', (int) strtotime((string) entries()->registry()->get('fetch.data.created_at')));
         }
     });
 
-    flextype('emitter')->addListener('onEntriesCreate', static function (): void {
-        if (flextype('entries')->registry()->get('create.data.created_at') !== null) {
+    emitter()->addListener('onEntriesCreate', static function (): void {
+        if (entries()->registry()->get('create.data.created_at') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('create.data.created_at', date(flextype('registry')->get('flextype.settings.date_format'), time()));
+        entries()->registry()->set('create.data.created_at', date(registry()->get('flextype.settings.date_format'), time()));
     });
 }
+
+
diff --git a/src/flextype/Foundation/Entries/Fields/CreatedByField.php b/src/flextype/Foundation/Entries/Fields/CreatedByField.php
index cc674f280..7c59a3bd8 100644
--- a/src/flextype/Foundation/Entries/Fields/CreatedByField.php
+++ b/src/flextype/Foundation/Entries/Fields/CreatedByField.php
@@ -7,12 +7,12 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.created_by.enabled')) {
-    flextype('emitter')->addListener('onEntriesCreate', static function (): void {
-        if (flextype('entries')->registry()->get('create.data.created_by') !== null) {
+if (registry()->get('flextype.settings.entries.fields.created_by.enabled')) {
+    emitter()->addListener('onEntriesCreate', static function (): void {
+        if (entries()->registry()->get('create.data.created_by') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('create.data.created_by', '');
+        entries()->registry()->set('create.data.created_by', '');
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/EntriesField.php b/src/flextype/Foundation/Entries/Fields/EntriesField.php
index a59bec0bc..78491e50a 100644
--- a/src/flextype/Foundation/Entries/Fields/EntriesField.php
+++ b/src/flextype/Foundation/Entries/Fields/EntriesField.php
@@ -9,14 +9,14 @@
 
 use Atomastic\Arrays\Arrays;
 
-if (flextype('registry')->get('flextype.settings.entries.fields.entries.fetch.enabled')) {
-     flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-         if (flextype('entries')->registry()->has('fetch.data.entries.fetch')) {
+if (registry()->get('flextype.settings.entries.fields.entries.fetch.enabled')) {
+     emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+         if (entries()->registry()->has('fetch.data.entries.fetch')) {
              // Get fetch.
-             $original = flextype('entries')->registry()->get('fetch');
+             $original = entries()->registry()->get('fetch');
              $data = [];
 
-             switch (flextype('registry')->get('flextype.settings.entries.fields.entries.fetch.result')) {
+             switch (registry()->get('flextype.settings.entries.fields.entries.fetch.result')) {
                  case 'toArray':
                      $resultTo = 'toArray';
                      break;
@@ -28,11 +28,11 @@
              }
 
              // Modify fetch.
-             foreach (flextype('entries')->registry()->get('fetch.data.entries.fetch') as $field => $body) {
+             foreach (entries()->registry()->get('fetch.data.entries.fetch') as $field => $body) {
 
                  if (isset($body['options']['method']) &&
                      strpos($body['options']['method'], 'fetch') !== false &&
-                     is_callable([flextype('entries'), $body['options']['method']])) {
+                     is_callable([entries(), $body['options']['method']])) {
                      $fetchFromCallbackMethod = $body['options']['method'];
                  } else {
                      $fetchFromCallbackMethod = 'fetch';
@@ -40,7 +40,7 @@
 
                  $result = isset($body['result']) && in_array($body['result'], ['toArray', 'toObject']) ? $body['result'] : $resultTo;
 
-                 $data[$field] = flextype('entries')->{$fetchFromCallbackMethod}($body['id'],
+                 $data[$field] = entries()->{$fetchFromCallbackMethod}($body['id'],
                                                             isset($body['options']) ?
                                                                   $body['options'] :
                                                                   []);
@@ -49,9 +49,9 @@
              }
 
              // Save fetch.
-             flextype('entries')->registry()->set('fetch.id', $original['id']);
-             flextype('entries')->registry()->set('fetch.options', $original['options']);
-             flextype('entries')->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
+             entries()->registry()->set('fetch.id', $original['id']);
+             entries()->registry()->set('fetch.options', $original['options']);
+             entries()->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
          }
      });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/IdField.php b/src/flextype/Foundation/Entries/Fields/IdField.php
index 9ddb01b9c..31805baf4 100644
--- a/src/flextype/Foundation/Entries/Fields/IdField.php
+++ b/src/flextype/Foundation/Entries/Fields/IdField.php
@@ -8,14 +8,14 @@
  */
 
 
-if (flextype('registry')->get('flextype.settings.entries.fields.id.enabled')) {
+if (registry()->get('flextype.settings.entries.fields.id.enabled')) {
     
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
    
-        if (flextype('entries')->registry()->get('fetch.data.id') !== null) {
+        if (entries()->registry()->get('fetch.data.id') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('fetch.data.id', (string) strings(flextype('entries')->registry()->get('fetch.id'))->trimSlashes());
+        entries()->registry()->set('fetch.data.id', (string) strings(entries()->registry()->get('fetch.id'))->trimSlashes());
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/MediaField.php b/src/flextype/Foundation/Entries/Fields/MediaField.php
index fb1b9a68b..19b48ff3b 100644
--- a/src/flextype/Foundation/Entries/Fields/MediaField.php
+++ b/src/flextype/Foundation/Entries/Fields/MediaField.php
@@ -9,14 +9,14 @@
 
 use Atomastic\Arrays\Arrays;
 
-if (flextype('registry')->get('flextype.settings.entries.fields.media.files.fetch.enabled')) {
-     flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-         if (flextype('entries')->registry()->has('fetch.data.media.files.fetch')) {
+if (registry()->get('flextype.settings.entries.fields.media.files.fetch.enabled')) {
+     emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+         if (entries()->registry()->has('fetch.data.media.files.fetch')) {
              // Get fetch.
-             $original = flextype('entries')->registry()->get('fetch');
+             $original = entries()->registry()->get('fetch');
              $data = [];
 
-             switch (flextype('registry')->get('flextype.settings.entries.fields.media.files.fetch.result')) {
+             switch (registry()->get('flextype.settings.entries.fields.media.files.fetch.result')) {
                  case 'toArray':
                      $resultTo = 'toArray';
                      break;
@@ -28,7 +28,7 @@
              }
 
              // Modify fetch.
-             foreach (flextype('entries')->registry()->get('fetch.data.media.files.fetch') as $field => $body) {
+             foreach (entries()->registry()->get('fetch.data.media.files.fetch') as $field => $body) {
 
                  if (isset($body['options']['method']) &&
                      strpos($body['options']['method'], 'fetch') !== false &&
@@ -50,23 +50,23 @@
              }
 
              // Save fetch.
-             flextype('entries')->registry()->set('fetch.id', $original['id']);
-             flextype('entries')->registry()->set('fetch.options', $original['options']);
-             flextype('entries')->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
+             entries()->registry()->set('fetch.id', $original['id']);
+             entries()->registry()->set('fetch.options', $original['options']);
+             entries()->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
          }
      });
 }
 
 
-if (flextype('registry')->get('flextype.settings.entries.fields.media.folders.fetch.enabled')) {
-     flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-         if (flextype('entries')->registry()->has('fetch.data.media.folders.fetch')) {
+if (registry()->get('flextype.settings.entries.fields.media.folders.fetch.enabled')) {
+     emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+         if (entries()->registry()->has('fetch.data.media.folders.fetch')) {
 
              // Get fetch.
-             $original = flextype('entries')->registry()->get('fetch');
+             $original = entries()->registry()->get('fetch');
              $data = [];
 
-             switch (flextype('registry')->get('flextype.settings.entries.fields.media.folders.fetch.result')) {
+             switch (registry()->get('flextype.settings.entries.fields.media.folders.fetch.result')) {
                  case 'toArray':
                      $resultTo = 'toArray';
                      break;
@@ -78,7 +78,7 @@
              }
 
              // Modify fetch.
-             foreach (flextype('entries')->registry()->get('fetch.data.media.folders.fetch') as $field => $body) {
+             foreach (entries()->registry()->get('fetch.data.media.folders.fetch') as $field => $body) {
 
                  if (isset($body['options']['method']) &&
                      strpos($body['options']['method'], 'fetch') !== false &&
@@ -100,9 +100,9 @@
              }
 
              // Save fetch.
-             flextype('entries')->registry()->set('fetch.id', $original['id']);
-             flextype('entries')->registry()->set('fetch.options', $original['options']);
-             flextype('entries')->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
+             entries()->registry()->set('fetch.id', $original['id']);
+             entries()->registry()->set('fetch.options', $original['options']);
+             entries()->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
          }
      });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/ModifiedAtField.php b/src/flextype/Foundation/Entries/Fields/ModifiedAtField.php
index f6ae4cb5b..c90483cf6 100644
--- a/src/flextype/Foundation/Entries/Fields/ModifiedAtField.php
+++ b/src/flextype/Foundation/Entries/Fields/ModifiedAtField.php
@@ -7,12 +7,12 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.modified_at.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-        if (flextype('entries')->registry()->get('fetch.data.modified_at') !== null) {
+if (registry()->get('flextype.settings.entries.fields.modified_at.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+        if (entries()->registry()->get('fetch.data.modified_at') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('fetch.data.modified_at', (int) filesystem()->file(flextype('entries')->getFileLocation(flextype('entries')->registry()->get('fetch.id')))->lastModified());
+        entries()->registry()->set('fetch.data.modified_at', (int) filesystem()->file(entries()->getFileLocation(entries()->registry()->get('fetch.id')))->lastModified());
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/ParsersField.php b/src/flextype/Foundation/Entries/Fields/ParsersField.php
index d7acc1c0b..7cd42a332 100644
--- a/src/flextype/Foundation/Entries/Fields/ParsersField.php
+++ b/src/flextype/Foundation/Entries/Fields/ParsersField.php
@@ -7,38 +7,38 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.parsers.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
+if (registry()->get('flextype.settings.entries.fields.parsers.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
         processParsersField();
     });
 }
 
 function processParsersField(): void
 {
-    if (flextype('entries')->registry()->get('fetch.data.cache.enabled') == null) {
+    if (entries()->registry()->get('fetch.data.cache.enabled') == null) {
         $cache = false;
     } else {
-        $cache = (bool) flextype('entries')->registry()->get('fetch.data.cache.enabled');
+        $cache = (bool) entries()->registry()->get('fetch.data.cache.enabled');
     }
 
-    if (flextype('entries')->registry()->get('fetch.data.parsers') != null) {
-        foreach (flextype('entries')->registry()->get('fetch.data.parsers') as $parserName => $parserData) {
+    if (entries()->registry()->get('fetch.data.parsers') != null) {
+        foreach (entries()->registry()->get('fetch.data.parsers') as $parserName => $parserData) {
             if (in_array($parserName, ['markdown', 'shortcode'])) {
-                if (flextype('entries')->registry()->get('fetch.data.parsers.'.$parserName.'.enabled') === true) {
-                    if (flextype('entries')->registry()->get('fetch.data.parsers.'.$parserName.'.fields') != null) {
-                        if (is_array(flextype('entries')->registry()->get('fetch.data.parsers.'.$parserName.'.fields'))) {
-                            foreach (flextype('entries')->registry()->get('fetch.data.parsers.'.$parserName.'.fields') as $field) {
-                                if (! in_array($field, flextype('registry')->get('flextype.settings.entries.content.fields'))) {
+                if (entries()->registry()->get('fetch.data.parsers.'.$parserName.'.enabled') === true) {
+                    if (entries()->registry()->get('fetch.data.parsers.'.$parserName.'.fields') != null) {
+                        if (is_array(entries()->registry()->get('fetch.data.parsers.'.$parserName.'.fields'))) {
+                            foreach (entries()->registry()->get('fetch.data.parsers.'.$parserName.'.fields') as $field) {
+                                if (! in_array($field, registry()->get('flextype.settings.entries.content.fields'))) {
                                     if ($parserName == 'markdown') {
-                                        if (arrays(flextype('entries')->registry()->get('fetch.data'))->has($field)) {
-                                            flextype('entries')->registry()->set('fetch.data.'.$field,
-                                                                            flextype('parsers')->markdown()->parse(flextype('entries')->registry()->get('fetch.data.'.$field), $cache));
+                                        if (arrays(entries()->registry()->get('fetch.data'))->has($field)) {
+                                            entries()->registry()->set('fetch.data.'.$field,
+                                                                            parsers()->markdown()->parse(entries()->registry()->get('fetch.data.'.$field), $cache));
                                         }
                                     }
                                     if ($parserName == 'shortcode') {
-                                        if (arrays(flextype('entries')->registry()->get('fetch.data'))->has($field)) {
-                                            flextype('entries')->registry()->set('fetch.data.'.$field,
-                                                                            flextype('parsers')->shortcode()->process(flextype('entries')->registry()->get('fetch.data.'.$field), $cache));
+                                        if (arrays(entries()->registry()->get('fetch.data'))->has($field)) {
+                                            entries()->registry()->set('fetch.data.'.$field,
+                                                                            parsers()->shortcode()->process(entries()->registry()->get('fetch.data.'.$field), $cache));
                                         }
                                     }
                                 }
diff --git a/src/flextype/Foundation/Entries/Fields/PublishedAtField.php b/src/flextype/Foundation/Entries/Fields/PublishedAtField.php
index 5668b9eb5..e20c53643 100644
--- a/src/flextype/Foundation/Entries/Fields/PublishedAtField.php
+++ b/src/flextype/Foundation/Entries/Fields/PublishedAtField.php
@@ -7,20 +7,20 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.published_at.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-        if (flextype('entries')->registry()->get('fetch.data.published_at') === null) {
-            flextype('entries')->registry()->set('fetch.data.published_at', (int) filesystem()->file(flextype('entries')->getFileLocation(flextype('entries')->registry()->get('fetch.id')))->lastModified());
+if (registry()->get('flextype.settings.entries.fields.published_at.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+        if (entries()->registry()->get('fetch.data.published_at') === null) {
+            entries()->registry()->set('fetch.data.published_at', (int) filesystem()->file(entries()->getFileLocation(entries()->registry()->get('fetch.id')))->lastModified());
         } else {
-            flextype('entries')->registry()->set('fetch.data.published_at', (int) strtotime((string) flextype('entries')->registry()->get('fetch.data.published_at')));
+            entries()->registry()->set('fetch.data.published_at', (int) strtotime((string) entries()->registry()->get('fetch.data.published_at')));
         }
     });
 
-    flextype('emitter')->addListener('onEntriesCreate', static function (): void {
-        if (flextype('entries')->registry()->get('create.data.published_at') !== null) {
+    emitter()->addListener('onEntriesCreate', static function (): void {
+        if (entries()->registry()->get('create.data.published_at') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('create.data.published_at', date(flextype('registry')->get('flextype.settings.date_format'), time()));
+        entries()->registry()->set('create.data.published_at', date(registry()->get('flextype.settings.date_format'), time()));
     });
-}
+}
\ No newline at end of file
diff --git a/src/flextype/Foundation/Entries/Fields/PublishedByField.php b/src/flextype/Foundation/Entries/Fields/PublishedByField.php
index ac040a98a..510f7e646 100644
--- a/src/flextype/Foundation/Entries/Fields/PublishedByField.php
+++ b/src/flextype/Foundation/Entries/Fields/PublishedByField.php
@@ -7,12 +7,12 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.published_by.enabled')) {
-    flextype('emitter')->addListener('onEntriesCreate', static function (): void {
-        if (flextype('entries')->registry()->get('create.data.published_by') !== null) {
+if (registry()->get('flextype.settings.entries.fields.published_by.enabled')) {
+    emitter()->addListener('onEntriesCreate', static function (): void {
+        if (entries()->registry()->get('create.data.published_by') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('create.data.published_by', '');
+        entries()->registry()->set('create.data.published_by', '');
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/RegistryField.php b/src/flextype/Foundation/Entries/Fields/RegistryField.php
index 2d0c73861..172416c50 100644
--- a/src/flextype/Foundation/Entries/Fields/RegistryField.php
+++ b/src/flextype/Foundation/Entries/Fields/RegistryField.php
@@ -7,17 +7,17 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.registry.get.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-        if (flextype('entries')->registry()->has('fetch.data.registry.get')) {
+if (registry()->get('flextype.settings.entries.fields.registry.get.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+        if (entries()->registry()->has('fetch.data.registry.get')) {
             // Get fetch.
-            $original = flextype('entries')->registry()->get('fetch');
+            $original = entries()->registry()->get('fetch');
 
             $data = [];
 
             // Modify fetch.
-            foreach (flextype('entries')->registry()->get('fetch.data.registry.get') as $field => $body) {
-                $data = arrays($data)->merge(arrays($data)->set($field, flextype('registry')->get($body['key'],
+            foreach (entries()->registry()->get('fetch.data.registry.get') as $field => $body) {
+                $data = arrays($data)->merge(arrays($data)->set($field, registry()->get($body['key'],
                                                           isset($body['default']) ?
                                                                 $body['default'] :
                                                                 []))->toArray())->toArray();
@@ -25,7 +25,7 @@
             }
 
             // Save fetch.
-            flextype('entries')->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
+            entries()->registry()->set('fetch.data', arrays($original['data'])->merge($data)->toArray());
         }
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/RoutableField.php b/src/flextype/Foundation/Entries/Fields/RoutableField.php
index 3310deffe..22628d954 100644
--- a/src/flextype/Foundation/Entries/Fields/RoutableField.php
+++ b/src/flextype/Foundation/Entries/Fields/RoutableField.php
@@ -8,20 +8,20 @@
  */
 
 
-if (flextype('registry')->get('flextype.settings.entries.fields.routable.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-        if (flextype('entries')->registry()->get('fetch.data.routable') === null) {
-            flextype('entries')->registry()->set('fetch.data.routable', true);
+if (registry()->get('flextype.settings.entries.fields.routable.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+        if (entries()->registry()->get('fetch.data.routable') === null) {
+            entries()->registry()->set('fetch.data.routable', true);
         } else {
-            flextype('entries')->registry()->set('fetch.data.routable', (bool) flextype('entries')->registry()->get('fetch.data.routable'));
+            entries()->registry()->set('fetch.data.routable', (bool) entries()->registry()->get('fetch.data.routable'));
         }
     });
 
-    flextype('emitter')->addListener('onEntriesCreate', static function (): void {
-        if (flextype('entries')->registry()->get('create.data.routable') === null) {
-            flextype('entries')->registry()->set('create.data.routable', true);
+    emitter()->addListener('onEntriesCreate', static function (): void {
+        if (entries()->registry()->get('create.data.routable') === null) {
+            entries()->registry()->set('create.data.routable', true);
         } else {
-            flextype('entries')->registry()->set('create.data.routable', (bool) flextype('entries')->registry()->get('create.data.routable'));
+            entries()->registry()->set('create.data.routable', (bool) entries()->registry()->get('create.data.routable'));
         }
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/SlugField.php b/src/flextype/Foundation/Entries/Fields/SlugField.php
index 84bd70e5f..9cb2e0211 100644
--- a/src/flextype/Foundation/Entries/Fields/SlugField.php
+++ b/src/flextype/Foundation/Entries/Fields/SlugField.php
@@ -8,13 +8,13 @@
  */
 
 
-if (flextype('registry')->get('flextype.settings.entries.fields.slug.enabled')) {
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function (): void {
-        if (flextype('entries')->registry()->get('fetch.data.slug') !== null) {
+if (registry()->get('flextype.settings.entries.fields.slug.enabled')) {
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void {
+        if (entries()->registry()->get('fetch.data.slug') !== null) {
             return;
         }
 
-        $parts = explode('/', ltrim(rtrim(flextype('entries')->registry()->get('fetch.id'), '/'), '/'));
-        flextype('entries')->registry()->set('fetch.data.slug', (string) end($parts));
+        $parts = explode('/', ltrim(rtrim(entries()->registry()->get('fetch.id'), '/'), '/'));
+        entries()->registry()->set('fetch.data.slug', (string) end($parts));
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/UuidField.php b/src/flextype/Foundation/Entries/Fields/UuidField.php
index ac87fd195..f690fcf1c 100644
--- a/src/flextype/Foundation/Entries/Fields/UuidField.php
+++ b/src/flextype/Foundation/Entries/Fields/UuidField.php
@@ -9,12 +9,12 @@
 
 use Ramsey\Uuid\Uuid;
 
-if (flextype('registry')->get('flextype.settings.entries.fields.uuid.enabled')) {
-    flextype('emitter')->addListener('onEntriesCreate', static function (): void {
-        if (flextype('entries')->registry()->get('create.data.uuid') !== null) {
+if (registry()->get('flextype.settings.entries.fields.uuid.enabled')) {
+    emitter()->addListener('onEntriesCreate', static function (): void {
+        if (entries()->registry()->get('create.data.uuid') !== null) {
             return;
         }
 
-        flextype('entries')->registry()->set('create.data.uuid', Uuid::uuid4()->toString());
+        entries()->registry()->set('create.data.uuid', Uuid::uuid4()->toString());
     });
 }
diff --git a/src/flextype/Foundation/Entries/Fields/VisibilityField.php b/src/flextype/Foundation/Entries/Fields/VisibilityField.php
index 3f5f07ae0..d7b6ee211 100644
--- a/src/flextype/Foundation/Entries/Fields/VisibilityField.php
+++ b/src/flextype/Foundation/Entries/Fields/VisibilityField.php
@@ -7,26 +7,26 @@
  * Founded by Sergey Romanenko and maintained by Flextype Community.
  */
 
-if (flextype('registry')->get('flextype.settings.entries.fields.visibility.enabled')) {
+if (registry()->get('flextype.settings.entries.fields.visibility.enabled')) {
     $visibility = [
         'draft' => 'draft',
         'hidden' => 'hidden',
         'visible' => 'visible',
     ];
 
-    flextype('emitter')->addListener('onEntriesFetchSingleHasResult', static function () use ($visibility): void {
-        if (flextype('entries')->registry()->get('fetch.data.visibility') !== null && in_array(flextype('entries')->registry()->get('fetch.data.visibility'), $visibility)) {
-            flextype('entries')->registry()->set('fetch.data.visibility', (string) $visibility[flextype('entries')->registry()->get('fetch.data.visibility')]);
+    emitter()->addListener('onEntriesFetchSingleHasResult', static function () use ($visibility): void {
+        if (entries()->registry()->get('fetch.data.visibility') !== null && in_array(entries()->registry()->get('fetch.data.visibility'), $visibility)) {
+            entries()->registry()->set('fetch.data.visibility', (string) $visibility[entries()->registry()->get('fetch.data.visibility')]);
         } else {
-            flextype('entries')->registry()->set('fetch.data.visibility', (string) $visibility['visible']);
+            entries()->registry()->set('fetch.data.visibility', (string) $visibility['visible']);
         }
     });
 
-    flextype('emitter')->addListener('onEntriesCreate', static function () use ($visibility): void {
-        if (flextype('entries')->registry()->get('create.data.visibility') !== null && in_array(flextype('entries')->registry()->get('create.data.visibility'), $visibility)) {
-            flextype('entries')->registry()->set('create.data.visibility', (string) $visibility[flextype('entries')->registry()->get('create.data.visibility')]);
+    emitter()->addListener('onEntriesCreate', static function () use ($visibility): void {
+        if (entries()->registry()->get('create.data.visibility') !== null && in_array(entries()->registry()->get('create.data.visibility'), $visibility)) {
+            entries()->registry()->set('create.data.visibility', (string) $visibility[entries()->registry()->get('create.data.visibility')]);
         } else {
-            flextype('entries')->registry()->set('create.data.visibility', (string) $visibility['visible']);
+            entries()->registry()->set('create.data.visibility', (string) $visibility['visible']);
         }
     });
 }