[BUGFIX] Now work as a global extension