diff --git a/README.md b/README.md
index ae54b9a..78b7f9e 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,9 @@
 
 ## TODO - WIP
 
-- [ ] Maybe locale can be a promise so we can await for it on the template;
+- [x] Maybe locale can be a promise so we can await for it on the template;
 - [ ] Wiki on github;
-- [ ] Find a more flexible way to preload dictionaries so it's possible to preload partial dictionaries.
+- [x] Find a more flexible way to preload dictionaries so it's possible to preload partial dictionaries.
 
 ## Usage
 
diff --git a/example/src/i18n.js b/example/src/i18n.js
index d6ebe1e..b745f1f 100644
--- a/example/src/i18n.js
+++ b/example/src/i18n.js
@@ -1,6 +1,6 @@
-import { registerLocaleLoader } from 'svelte-i18n'
+import { register } from 'svelte-i18n'
 
-registerLocaleLoader('en', () => import('../messages/en.json'))
-registerLocaleLoader('pt-BR', () => import('../messages/pt-BR.json'))
-registerLocaleLoader('en-US', () => import('../messages/en-US.json'))
-registerLocaleLoader('es-ES', () => import('../messages/es-ES.json'))
+register('en', () => import('../messages/en.json'))
+register('pt-BR', () => import('../messages/pt-BR.json'))
+register('en-US', () => import('../messages/en-US.json'))
+register('es-ES', () => import('../messages/es-ES.json'))
diff --git a/example/src/routes/_layout.svelte b/example/src/routes/_layout.svelte
index 9234774..01d1f8c 100644
--- a/example/src/routes/_layout.svelte
+++ b/example/src/routes/_layout.svelte
@@ -1,5 +1,5 @@
 <script context="module">
-  import { locale, locales, getClientLocale } from 'svelte-i18n'
+  import { locale, locales, getClientLocale, waitLocale } from 'svelte-i18n'
   import Lang from 'svelte-i18n/Lang.svelte'
 
   export async function preload() {
diff --git a/example/src/routes/about/index.svelte b/example/src/routes/about/index.svelte
index 2c112d5..40674cb 100644
--- a/example/src/routes/about/index.svelte
+++ b/example/src/routes/about/index.svelte
@@ -1,12 +1,12 @@
 <script context="module">
-  import { registerLocaleLoader, flushLocaleQueue } from 'svelte-i18n'
+  import { register, waitLocale } from 'svelte-i18n'
 
-  registerLocaleLoader('en-US', () => import('./_locales/en-US.json'))
-  registerLocaleLoader('pt-BR', () => import('./_locales/pt-BR.json'))
-  registerLocaleLoader('es-ES', () => import('./_locales/es-ES.json'))
+  register('en-US', () => import('./_locales/en-US.json'))
+  register('pt-BR', () => import('./_locales/pt-BR.json'))
+  register('es-ES', () => import('./_locales/es-ES.json'))
 
   export async function preload() {
-    return flushLocaleQueue()
+    return waitLocale()
   }
 </script>