diff --git a/system/src/Grav/Common/Page/Medium.php b/system/src/Grav/Common/Page/Medium.php
index 1a6371041..bbee389c7 100644
--- a/system/src/Grav/Common/Page/Medium.php
+++ b/system/src/Grav/Common/Page/Medium.php
@@ -2,12 +2,12 @@
 namespace Grav\Common\Page;
 
 use Grav\Common\Config\Config;
+use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
 use Grav\Common\GravTrait;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Data;
 use Gregwar\Image\Image as ImageFile;
-use RocketTheme\Toolbox\File\YamlFile;
 
 /**
  * The Image medium holds information related to an individual image. These are then stored in the Media object.
@@ -333,7 +333,7 @@ class Medium extends Data
 
         $path = $this->get('path') . '/' . $this->get('filename') . '.meta.' . $type;
         if ($type == 'yaml') {
-            $this->merge(YamlFile::instance($path)->content());
+            $this->merge(CompiledYamlFile::instance($path)->content());
         } elseif (in_array($type, array('jpg', 'jpeg', 'png', 'gif'))) {
             $this->set('thumb', $path);
         }
diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index c50436eed..895dbc17c 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -4,9 +4,9 @@ namespace Grav\Common;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
+use Grav\Common\File\CompiledYamlFile;
 use RocketTheme\Toolbox\Event\EventDispatcher;
 use RocketTheme\Toolbox\Event\EventSubscriberInterface;
-use RocketTheme\Toolbox\File\YamlFile;
 
 /**
  * The Plugins object holds an array of all the plugin objects that
@@ -105,11 +105,11 @@ class Plugins extends Iterator
         $blueprint->name = $name;
 
         // Load default configuration.
-        $file = YamlFile::instance("plugins://{$name}/{$name}.yaml");
+        $file = CompiledYamlFile::instance("plugins://{$name}/{$name}.yaml");
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $file = YamlFile::instance("user://config/plugins/{$name}.yaml");
+        $file = CompiledYamlFile::instance("user://config/plugins/{$name}.yaml");
         $obj->merge($file->content());
 
         // Save configuration always to user/config.