diff --git a/ConfigProvider.php b/ConfigProvider.php
index 757d32a..c74019c 100644
--- a/ConfigProvider.php
+++ b/ConfigProvider.php
@@ -1,8 +1,8 @@
 <?php
 namespace Dfe\IPay88;
 use Df\Payment\ConfigProvider\IOptions;
-use Dfe\IPay88\Source\Option as Opt;
 // 2017-04-10
+/** @method Settings s() */
 final class ConfigProvider extends \Df\Payment\ConfigProvider implements IOptions {
 	/**
 	 * 2017-09-18
@@ -11,7 +11,7 @@ final class ConfigProvider extends \Df\Payment\ConfigProvider implements IOption
 	 * @used-by \Df\Payment\ConfigProvider::configOptions()
 	 * @return array(<value> => <label>)
 	 */
-	function options() {return Opt::s()->map();}
+	function options() {return $this->s()->options()->o(true);}
 
 	/**
 	 * 2017-04-13
diff --git a/Settings.php b/Settings.php
index b00fba4..6793334 100644
--- a/Settings.php
+++ b/Settings.php
@@ -1,5 +1,14 @@
 <?php
 namespace Dfe\IPay88;
+use Df\Payment\Settings\Options as O;
+use Dfe\IPay88\Source\Option as OptionSource;
 // 2017-04-10
 /** @method static Settings s() */
-final class Settings extends \Df\Payment\Settings {}
\ No newline at end of file
+final class Settings extends \Df\Payment\Settings {
+	/**
+	 * 2018-08-24
+	 * @used-by \Dfe\IPay88\ConfigProvider::options()
+	 * @return O
+	 */
+	function options() {return $this->_options(OptionSource::class);}
+}
\ No newline at end of file
diff --git a/Source/Option.php b/Source/Option.php
index e3d4e78..bce6c4a 100644
--- a/Source/Option.php
+++ b/Source/Option.php
@@ -1,8 +1,11 @@
 <?php
 namespace Dfe\IPay88\Source;
-// 2017-04-10
-// [iPay88] The available payment options for Malaysia: https://mage2.pro/t/3635
-/** @method static Option s() */
+/**
+ * 2017-04-10
+ * [iPay88] The available payment options for Malaysia: https://mage2.pro/t/3635
+ * @used-by \Dfe\IPay88\Settings::options()
+ * @method static Option s()
+ */
 final class Option extends \Df\Config\Source {
 	/**
 	 * 2017-04-13
@@ -21,7 +24,6 @@ function all() {return $this->map() + df_module_json($this, 'options/multicurren
 	 * @see \Df\Config\Source::map()
 	 * @used-by all()
 	 * @used-by \Df\Config\Source::toOptionArray()
-	 * @used-by \Dfe\IPay88\ConfigProvider::options()
 	 * @return array(<value> => <label>)
 	 */
 	function map() {return df_module_json($this, 'options/myr');}
diff --git a/composer.json b/composer.json
index 4845409..69e61d0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/ipay88"
-	,"version": "1.5.3"
+	,"version": "1.6.0"
 	,"description": "iPay88 integration with Magento 2"
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/extensions/ipay88"