diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 47060752c1..6cc396fe82 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -3,12 +3,14 @@
 ## [5.6.1](https://github.com/phalcon/cphalcon/releases/tag/v5.6.0) (xxxx-xx-xx)
 
 ### Changed
- 
+- 
+- Changed `Phalcon\Cli\Router::setDefaultAction` and `Phalcon\Cli\Router::setDefaultModule` to return the object back for a fluent interface [#16328](https://github.com/phalcon/cphalcon/issues/16328)
+
 ### Added
  
 ### Fixed
 
-- Fixed `/Db/Adapter/Pdo/Postgresql::describeColumns` to return the correct string back [#16371](https://github.com/phalcon/cphalcon/issues/16371)
+- Fixed `Phalcon\Db\Adapter\Pdo\Postgresql::describeColumns()` to return the correct string back [#16371](https://github.com/phalcon/cphalcon/issues/16371)
 
 ### Removed
 
diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep
index bfbedd811e..7e3a416d51 100644
--- a/phalcon/Cli/Router.zep
+++ b/phalcon/Cli/Router.zep
@@ -461,17 +461,20 @@ class Router extends AbstractInjectionAware
     /**
      * Sets the default action name
      */
-    public function setDefaultAction(string actionName)
+    public function setDefaultAction(string actionName) -> <Router>
     {
         let this->defaultAction = actionName;
+        
+        return this;
     }
 
     /**
      * Sets the name of the default module
      */
-    public function setDefaultModule(string moduleName)
+    public function setDefaultModule(string moduleName) -> <Router>
     {
         let this->defaultModule = moduleName;
+        return this;
     }
 
     /**