diff --git a/docs/api.rst b/docs/api.rst
index 2e82ba566..3b95caad7 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -1,79 +1,80 @@
 ..  This file is part of Invenio
     Copyright (C) 2014 CERN.
 
     Invenio is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.
 
     Invenio is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with Invenio; if not, write to the Free Software Foundation, Inc.,
     59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 .. _api:
 
 API
 ===
 
 .. toctree::
    :maxdepth: 1
 
    base
 
 Extensions
 ----------
 
 .. toctree::
    :maxdepth: 1
 
    ext/assets
    ext/arxiv
    ext/crossref
    ext/elasticsearch
    ext/logging
    ext/login
    ext/session
    ext/sqlalchemy
    ext/template
 
 Modules
 -------
 
 .. toctree::
    :maxdepth: 1
 
    modules/annotations
    modules/apikeys
    modules/documentation
    modules/documents
    modules/formatter
    modules/jsonalchemy
    modules/multimedia
    modules/oauthclient
+   modules/redirector
    modules/tags
    modules/upgrader
    modules/uploader
    modules/workflows
 
 
 Utilities
 ---------
 
 .. toctree::
    :maxdepth: 1
 
    utils/datastructures
    utils/washers
 
 Legacy
 ------
 
 .. toctree::
    :maxdepth: 1
 
    legacy/bibrecord
diff --git a/docs/api.rst b/docs/modules/redirector.rst
similarity index 53%
copy from docs/api.rst
copy to docs/modules/redirector.rst
index 2e82ba566..8ca5b4444 100644
--- a/docs/api.rst
+++ b/docs/modules/redirector.rst
@@ -1,79 +1,41 @@
 ..  This file is part of Invenio
     Copyright (C) 2014 CERN.
 
     Invenio is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.
 
     Invenio is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with Invenio; if not, write to the Free Software Foundation, Inc.,
     59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-.. _api:
+Redirector
+==========
 
-API
-===
-
-.. toctree::
-   :maxdepth: 1
-
-   base
-
-Extensions
-----------
-
-.. toctree::
-   :maxdepth: 1
+.. automodule:: invenio.modules.redirector
+    :members:
 
-   ext/assets
-   ext/arxiv
-   ext/crossref
-   ext/elasticsearch
-   ext/logging
-   ext/login
-   ext/session
-   ext/sqlalchemy
-   ext/template
+Model
+-----
 
-Modules
--------
+.. automodule:: invenio.modules.redirector.models
+    :members:
 
-.. toctree::
-   :maxdepth: 1
-
-   modules/annotations
-   modules/apikeys
-   modules/documentation
-   modules/documents
-   modules/formatter
-   modules/jsonalchemy
-   modules/multimedia
-   modules/oauthclient
-   modules/tags
-   modules/upgrader
-   modules/uploader
-   modules/workflows
-
-
-Utilities
----------
-
-.. toctree::
-   :maxdepth: 1
+API
+----
 
-   utils/datastructures
-   utils/washers
+.. automodule:: invenio.modules.redirector.api
+    :members:
 
-Legacy
+Manage
 ------
 
-.. toctree::
-   :maxdepth: 1
+.. automodule:: invenio.modules.redirector.manage
+    :members:
 
-   legacy/bibrecord
diff --git a/invenio/legacy/goto/webinterface.py b/invenio/legacy/goto/webinterface.py
index 5fbd0e283..b158d154f 100644
--- a/invenio/legacy/goto/webinterface.py
+++ b/invenio/legacy/goto/webinterface.py
@@ -1,79 +1,81 @@
 ## This file is part of Invenio.
-## Copyright (C) 2012 CERN.
+## Copyright (C) 2012, 2013, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 """
 Implements persistent URLs
 """
 
 import inspect
 
 from invenio.config import CFG_SITE_URL
 from invenio.ext.legacy.handler import WebInterfaceDirectory
+from invenio.ext.logging import register_exception
+from invenio.legacy.webuser import collect_user_info
+from invenio.modules.redirector.api import get_redirection_data
+from invenio.modules.redirector.registry import get_redirect_method
 from invenio.utils.apache import SERVER_RETURN, HTTP_NOT_FOUND
 from invenio.utils.url import redirect_to_url
-from invenio.modules.redirector.api import get_redirection_data
-from invenio.legacy.webuser import collect_user_info
-from invenio.ext.logging import register_exception
+
 
 class WebInterfaceGotoPages(WebInterfaceDirectory):
     def _lookup(self, component, path):
         try:
             redirection_data = get_redirection_data(component)
-            goto_plugin = redirection_data['plugin']
+            goto_plugin = get_redirect_method(redirection_data['plugin'])
             args, dummy_varargs, dummy_varkw, defaults = inspect.getargspec(goto_plugin)
             args = args and list(args) or []
             args.reverse()
             defaults = defaults and list(defaults) or []
             defaults.reverse()
             params_to_pass = {}
             for arg, default in map(None, args, defaults):
                 params_to_pass[arg] = default
 
             def goto_handler(req, form):
                 ## Let's put what is in the GET query
                 for key, value in dict(form).items():
                     if key in params_to_pass:
                         params_to_pass[key] = str(value)
 
                 ## Let's override the params_to_pass to the call with the
                 ## arguments in the configuration
                 configuration_parameters = redirection_data['parameters'] or {}
                 params_to_pass.update(configuration_parameters)
 
                 ## Let's add default parameters if the plugin expects them
                 if 'component' in params_to_pass:
                     params_to_pass['component'] = component
                 if 'path' in params_to_pass:
                     params_to_pass['path'] = path
                 if 'user_info' in params_to_pass:
                     params_to_pass['user_info'] = collect_user_info(req)
                 if 'req' in params_to_pass:
                     params_to_pass['req'] = req
                 try:
                     new_url = goto_plugin(**params_to_pass)
                 except Exception as err:
                     register_exception(req=req, alert_admin=True)
                     raise SERVER_RETURN(HTTP_NOT_FOUND)
                 if new_url:
                     if new_url.startswith('/'):
                         new_url = CFG_SITE_URL + new_url
                     redirect_to_url(req, new_url)
                 else:
                     raise SERVER_RETURN(HTTP_NOT_FOUND)
             return goto_handler, []
         except ValueError:
             return None, []
diff --git a/invenio/modules/redirector/__init__.py b/invenio/modules/redirector/__init__.py
index eb537e874..d1eae461f 100644
--- a/invenio/modules/redirector/__init__.py
+++ b/invenio/modules/redirector/__init__.py
@@ -1,18 +1,20 @@
 # -*- coding: utf-8 -*-
 ##
 ## This file is part of Invenio.
-## Copyright (C) 2013 CERN.
+## Copyright (C) 2013, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+"""Init."""
diff --git a/invenio/modules/redirector/api.py b/invenio/modules/redirector/api.py
index ac8bf4c78..6f3d7c693 100644
--- a/invenio/modules/redirector/api.py
+++ b/invenio/modules/redirector/api.py
@@ -1,186 +1,139 @@
 # -*- coding: utf-8 -*-
-#
+##
 ## This file is part of Invenio.
-## Copyright (C) 2012, 2013 CERN.
+## Copyright (C) 2012, 2013, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-"""
-Redirecting engine.
-"""
-
-import datetime
-from sqlalchemy.exc import IntegrityError
+"""Redirecting engine."""
 
-from invenio.base.utils import autodiscover_redirect_methods
 from invenio.ext.sqlalchemy import db
-from invenio.modules.redirector.models import Goto
-from invenio.utils.datastructures import LazyDict
-from invenio.utils.json import json, json_unicode_to_utf8
-
-
-def register_redirect_methods():
-    out = {}
-    for module in autodiscover_redirect_methods():
-        if hasattr(module, 'goto'):
-            out[module.__name__.split('.')[-1]] = module.goto
-    return out
-
-REDIRECT_METHODS = LazyDict(register_redirect_methods)
+from .models import Goto
 
 
-def register_redirection(label, plugin, parameters=None, update_on_duplicate=False):
+def register_redirection(label, plugin, parameters=None,
+                         update_on_duplicate=False):
     """
-    Register a redirection from /goto/<LABEL> to the URL returned by running the
-    given plugin (as available in REDIRECT_METHODS), with the given parameters.
+    Register a redirection from /goto/<LABEL> to the URL.
 
-    @param label: the uniquely identifying label for this redirection
-    @type label: string
+    Register a redirection from /goto/<LABEL> to the URL returned by
+    running the given plugin (as available in REDIRECT_METHODS), with the
+    given parameters.
 
-    @param plugin: the algorithm that should resolve the redirection, usually:
+    :param label: the uniquely identifying label for this redirection
+    :type label: string
+
+    :param plugin: the algorithm that should resolve the redirection, usually:
         "goto_plugin_FOO"
-    @type plugin: string
+    :type plugin: string
 
-    @param parameters: further parameters that should be passed to the plugin.
+    :param parameters: further parameters that should be passed to the plugin.
         This should be a dictionary or None. Note that these parameters could
         be overridden by the query parameters.
-    @type parameters: dict or None
+    :type parameters: dict
 
-    @param update_on_duplicate: if False (default), if the label already exist it
-        L{register_redirection} will raise a ValueError exception. If True, it
-        will implicitly call L{update_redirection}.
-    @type update_on_duplicate: bool
+    :param update_on_duplicate: if False (default), if the label already
+        exist it L{register_redirection} will raise a ValueError exception.
+        If True, it will implicitly call L{update_redirection}.
+    :type update_on_duplicate: bool
 
-    @raises: ValueError in case of duplicate label and L{update_on_duplicate} is
-        set to False.
+    :raises: :exc:`~sqlalchemy.orm.exc.NoResultFound` in case not exist
+        and L{update_on_duplicate} is set to False.
 
-    @note: parameters are going to be serialized to JSON before being stored
+    :note: parameters are going to be serialized to JSON before being stored
         in the DB. Hence only JSON-serializable values should be put there.
     """
-    if Goto.query.filter_by(label=label).first() is not None:
-        raise ValueError("%s label already exists" % label)
-    if plugin not in REDIRECT_METHODS:
-        raise ValueError("%s plugin does not exist" % plugin)
-    if parameters is None:
-        parameters = {}
-    try:
-        parameters.items() ## dummy test to see if it exposes the dict interface
-        json_parameters = json.dumps(parameters)
-    except Exception as err:
-        raise ValueError("The parameters %s do not specify a valid JSON map: %s" % (parameters, err))
-    try:
-        now = datetime.datetime.now()
-        goto = Goto(label=label, plugin=plugin, parameters=json_parameters, creation_date=now, modification_date=now)
+    if not update_on_duplicate \
+       or Goto.query.filter_by(label=label).first():
+        goto = Goto(label=label, plugin=plugin,
+                    parameters=parameters)
         db.session.add(goto)
         db.session.commit()
+    else:
+        update_redirection(label=label, plugin=plugin, parameters=parameters)
 
-    except IntegrityError:
-        if Goto.query.filter_by(label=label).first() is not None:
-            if update_on_duplicate:
-                update_redirection(label=label, plugin=plugin, parameters=parameters)
-            else:
-                raise ValueError("%s label already exists" % label)
-        else:
-            ## This is due to some other issue
-            raise
 
 def update_redirection(label, plugin, parameters=None):
     """
+    Update an existing redirection from /goto/<LABEL> to the URL.
+
     Update an existing redirection from /goto/<LABEL> to the URL returned by
     running the given plugin (as available in REDIRECT_METHODS), with the given
     parameters.
 
-    @param label: the uniquely identifying label for this redirection
-    @type label: string
+    :param label: the uniquely identifying label for this redirection
+    :type label: string
 
-    @param plugin: the algorithm that should resolve the redirection, usually:
+    :param plugin: the algorithm that should resolve the redirection, usually:
         "goto_plugin_FOO"
-    @type plugin: string
+    :type plugin: string
 
-    @param parameters: further parameters that should be passed to the plugin.
+    :param parameters: further parameters that should be passed to the plugin.
         This should be a dictionary or None. Note that these parameters could
         be overridden by the query parameters.
-    @type parameters: dict or None
+    :type parameters: dict
 
-    @raises: ValueError in case the label does not already exist.
+    :raises: :exc:`~sqlalchemy.orm.exc.NoResultFound` in case the label does
+        not already exist.
 
-    @note: parameters are going to be serialized to JSON before being stored
+    :note: parameters are going to be serialized to JSON before being stored
         in the DB. Hence only JSON-serializable values should be put there.
     """
-    goto = Goto.query.filter_by(label=label).first()
-    if goto is None:
-        raise ValueError("%s label does not already exist" % label)
-    if plugin not in REDIRECT_METHODS:
-        raise ValueError("%s plugin does not exist" % plugin)
-    if parameters is None:
-        parameters = {}
-    try:
-        parameters.items() ## dummy test to see if it exposes the dict interface
-        json_parameters = json.dumps(parameters)
-    except Exception as err:
-        raise ValueError("The parameters %s do not specify a valid JSON map: %s" % (parameters, err))
+    goto = Goto.query.filter_by(label=label).one()
     goto.plugin = plugin
-    goto.parameters = json_parameters
-    goto.modification_date = datetime.datetime.now()
-    db.session.commit()
+    goto.parameters = parameters
+    try:
+        db.session.merge(goto)
+    except:
+        db.session.rollback()
+        # FIXME add re-raise exception
+    finally:
+        db.session.commit()
+
 
 def drop_redirection(label):
     """
     Delete an existing redirection identified by label.
 
-    @param label: the uniquely identifying label for this redirection
-    @type label: string
+    :param label: the uniquely identifying label for this redirection
+    :type label: string
     """
-    goto = Goto.query.filter_by(label=label).first()
-    db.session.delete(goto)
+    Goto.query.filter_by(label=label).delete()
     db.session.commit()
 
 
 def get_redirection_data(label):
     """
-    Returns all information about a given redirection identified by label.
+    Return all information about a given redirection identified by label.
 
-    @param label: the label identifying the redirection
-    @type label: string
+    :param label: the label identifying the redirection
+    :type label: string
 
-    @returns: a dictionary with the following keys:
+    :returns: a dictionary with the following keys:
         * label: the label
         * plugin: the name of the plugin
         * parameters: the parameters that are passed to the plugin
-            (deserialized from JSON)
+        (deserialized from JSON)
         * creation_date: datetime object on when the redirection was first
-            created.
+        created.
         * modification_date: datetime object on when the redirection was
-            last modified.
-    @rtype: dict
+        last modified.
+    :rtype: dict
 
-    @raises ValueError: in case the label does not exist.
-    """
-    res = Goto.query.filter_by(label=label).first()
-    if res is not None:
-        return {'label': res.label,
-                 'plugin': REDIRECT_METHODS[res.plugin],
-                 'parameters': json_unicode_to_utf8(json.loads(res.parameters)),
-                 'creation_date': res.creation_date,
-                 'modification_date': res.modification_date}
-    else:
-        raise ValueError("%s label does not exist" % label)
-
-
-def is_redirection_label_already_taken(label):
-    """
-    Returns True in case the given label is already taken.
+    :raises: :exc:`~sqlalchemy.orm.exc.NoResultFound` in case the label
+        does not exist.
     """
-    return Goto.query.filter_by(label=label).first() is not None
+    res = Goto.query.filter_by(label=label).one()
+    return res.to_dict()
diff --git a/invenio/modules/redirector/manage.py b/invenio/modules/redirector/manage.py
new file mode 100644
index 000000000..0756d7e9d
--- /dev/null
+++ b/invenio/modules/redirector/manage.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##
+## This file is part of Invenio.
+## Copyright (C) 2013, 2014 CERN.
+##
+## Invenio is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2 of the
+## License, or (at your option) any later version.
+##
+## Invenio is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Invenio; if not, write to the Free Software Foundation, Inc.,
+## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+"""Manage redirector module."""
+
+from __future__ import print_function
+
+from invenio.ext.script import Manager
+
+manager = Manager(usage=__doc__)
+
+
+@manager.command
+@manager.option("-u", "--update", dest="update_redirection",
+                action="store_true")
+def create(label, plugin, parameters, update_redirection=False):
+    """Register redirection page."""
+    from invenio.utils.json import json, json_unicode_to_utf8
+    from .api import register_redirection
+
+    parameters = json_unicode_to_utf8(json.loads(parameters))
+    register_redirection(label, plugin, parameters, update_redirection)
+
+
+@manager.command
+def read(label):
+    """Return all information about an redirection."""
+    import json
+    from .api import get_redirection_data
+    for k, v in sorted(get_redirection_data(label).items()):
+        if k != 'parameters':
+            print("{0}: {1}".format(k, v))
+        else:
+            print("{0}: {1}".format(k, json.dumps(v)))
+
+
+@manager.command
+@manager.option("-p", "--parameters", dest="parameters")
+def update(label, plugin, parameters=None):
+    """Update an existing redirection."""
+    from invenio.utils.json import json, json_unicode_to_utf8
+    from .api import update_redirection
+    parameters = parameters or '{}'
+    parameters = json_unicode_to_utf8(json.loads(parameters))
+    update_redirection(label, plugin, parameters)
+
+
+@manager.command
+def delete(label):
+    """Delete an existing redirection."""
+    from .api import drop_redirection
+    drop_redirection(label)
+
+
+@manager.command
+def list():
+    """Get a list of available plugins."""
+    from .registry import redirect_methods
+    for key in redirect_methods:
+        print(key)
+
+
+def main():
+    """Execute script."""
+    from invenio.base.factory import create_app
+    app = create_app()
+    manager.app = app
+    manager.run()
+
+if __name__ == '__main__':
+    main()
diff --git a/invenio/modules/redirector/models.py b/invenio/modules/redirector/models.py
index 468565294..71e88d204 100644
--- a/invenio/modules/redirector/models.py
+++ b/invenio/modules/redirector/models.py
@@ -1,40 +1,74 @@
 # -*- coding: utf-8 -*-
 #
 ## This file is part of Invenio.
-## Copyright (C) 2013 CERN.
+## Copyright (C) 2013, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-"""
-GoTo database models.
-"""
+"""GoTo database models."""
+
+# External imports
+from sqlalchemy.orm import validates
+import datetime
 
 # General imports.
 from invenio.ext.sqlalchemy import db
+from .registry import redirect_methods
 
 # Create your models here.
 
 
 class Goto(db.Model):
+
     """Represents a Goto record."""
+
     __tablename__ = 'goto'
     label = db.Column(db.String(150), primary_key=True)
     plugin = db.Column(db.String(150), nullable=False)
-    parameters = db.Column(db.Text, nullable=False)
-    creation_date = db.Column(db.DateTime, nullable=False, index=True)
-    modification_date = db.Column(db.DateTime, nullable=False, index=True)
+    _parameters = db.Column(db.JSON, nullable=False, default={},
+                            name="parameters")
+    creation_date = db.Column(db.DateTime, default=datetime.datetime.now,
+                              nullable=False, index=True)
+    modification_date = db.Column(db.DateTime, default=datetime.datetime.now,
+                                  onupdate=datetime.datetime.now,
+                                  nullable=False, index=True)
+
+    @validates('plugin')
+    def validate_plugin(self, key, plugin):
+        """Validate plugin name."""
+        if plugin not in redirect_methods:
+            raise ValueError("%s plugin does not exist" % plugin)
+
+        return plugin
+
+    @db.hybrid_property
+    def parameters(self):
+        """Get parameters method."""
+        return self._parameters
+
+    @parameters.setter
+    def parameters(self, value):
+        """Set parameters method."""
+        self._parameters = value or {}
 
+    def to_dict(self):
+        """ Return a dict representation of Goto."""
+        return {'label': self.label,
+                'plugin': self.plugin,
+                'parameters': self.parameters,
+                'creation_date': self.creation_date,
+                'modification_date': self.modification_date}
 
 __all__ = ['Goto']
diff --git a/invenio/modules/redirector/redirect_methods/__init__.py b/invenio/modules/redirector/redirect_methods/__init__.py
index e69de29bb..6694180d0 100644
--- a/invenio/modules/redirector/redirect_methods/__init__.py
+++ b/invenio/modules/redirector/redirect_methods/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+##
+## This file is part of Invenio.
+## Copyright (C) 2014 CERN.
+##
+## Invenio is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2 of the
+## License, or (at your option) any later version.
+##
+## Invenio is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Invenio; if not, write to the Free Software Foundation, Inc.,
+## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+"""Init."""
diff --git a/invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py b/invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
index 04cbcb312..18f4daecb 100644
--- a/invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
+++ b/invenio/modules/redirector/redirect_methods/goto_plugin_cern_hr_documents.py
@@ -1,161 +1,212 @@
 # -*- coding: utf-8 -*-
 ##
 ## This file is part of Invenio.
 ## Copyright (C) 2012, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 """
+This implements a redirection for CERN HR Documents.
+
 This implements a redirection for CERN HR Documents in the CERN Document
 Server. It's useful as a reference on how goto plugins could be implemented.
 """
 
 import time
 import re
 
 from invenio.legacy.search_engine import perform_request_search
 from invenio.legacy.bibrecord import get_fieldvalues
 from invenio.legacy.bibdocfile.api import BibRecDocs, InvenioBibDocFileError
 
+
 def make_cern_ssr_docname(lang, edition, modif=0):
+    """Make cern ssh docname."""
+    # FIXME the docs
     if modif:
         return "CERN_SRR_%(lang)s_ed%(edition)02d_modif%(modif)02d" % {
             'lang': lang,
             'edition': edition,
             'modif': modif
         }
     else:
         return "CERN_SRR_%(lang)s_ed%(edition)02d" % {
             'lang': lang,
             'edition': edition,
         }
 
 _RE_REVISION = re.compile(r"rev(\d\d)")
+
+
 def _get_revision(docname):
     """
+    Return the revision in a docname.
+
     Return the revision in a docname. E.g.:
     CERN_Circ_Op_en_02_rev01_Implementation measures.pdf -> 1
     CERN_Circ_Op_en_02_rev02_Implementation measures.PDF -> 2
     """
     g = _RE_REVISION.search(docname)
     if g:
         return int(g.group(1))
     return 0
 
+
 def _register_document(documents, docname, key):
     """
+    Register in the documents mapping the docname to key.
+
     Register in the documents mapping the docname to key, but only if the
-    docname has a revision higher of the docname already associated with a key
+    docname has a revision higher of the docname already associated with a key.
     """
     if key in documents:
         if _get_revision(docname) > _get_revision(documents[key]):
             documents[key] = docname
     else:
         documents[key] = docname
 
+
 def goto(type, document='', number=0, lang='en', modif=0):
+    """Goto function."""
+    # FIXME the docs
     today = time.strftime('%Y-%m-%d')
     if type == 'SRR':
         ## We would like a CERN Staff Rules and Regulations
-        recids = perform_request_search(cc='Staff Rules and Regulations', f="925__a:1996-01-01->%s 925__b:%s->9999-99-99" % (today, today))
+        recids = perform_request_search(
+            cc='Staff Rules and Regulations',
+            f="925__a:1996-01-01->%s 925__b:%s->9999-99-99" % (today, today))
         recid = recids[-1]
         reportnumber = get_fieldvalues(recid, '037__a')[0]
-        edition = int(reportnumber[-2:]) ## e.g. CERN-STAFF-RULES-ED08
-        return BibRecDocs(recid).get_bibdoc(make_cern_ssr_docname(lang, edition, modif)).get_file('.pdf').get_url()
+        edition = int(reportnumber[-2:])  # e.g. CERN-STAFF-RULES-ED08
+        return BibRecDocs(recid).get_bibdoc(
+            make_cern_ssr_docname(lang,
+                                  edition,
+                                  modif)).get_file('.pdf').get_url()
     elif type == "OPER-CIRC":
-        recids = perform_request_search(cc="Operational Circulars", p="reportnumber:\"CERN-OPER-CIRC-%s-*\"" % number, sf="925__a")
+        recids = perform_request_search(
+            cc="Operational Circulars",
+            p="reportnumber:\"CERN-OPER-CIRC-%s-*\"" % number, sf="925__a")
         recid = recids[-1]
         documents = {}
         bibrecdocs = BibRecDocs(recid)
         for docname in bibrecdocs.get_bibdoc_names():
             ldocname = docname.lower()
             if 'implementation' in ldocname:
                 _register_document(documents, docname, 'implementation-en')
             elif 'application' in ldocname:
                 _register_document(documents, docname, 'implementation-fr')
             elif 'archiving' in ldocname:
                 _register_document(documents, docname, 'archiving-en')
             elif 'archivage' in ldocname:
                 _register_document(documents, docname, 'archiving-fr')
             elif 'annexe' in ldocname or 'annexes_fr' in ldocname:
                 _register_document(documents, docname, 'annex-fr')
             elif 'annexes_en' in ldocname or 'annex' in ldocname:
                 _register_document(documents, docname, 'annex-en')
-            elif '_en_' in ldocname or '_eng_' in ldocname or '_angl_' in ldocname:
+            elif '_en_' in ldocname \
+                 or '_eng_' in ldocname or '_angl_' in ldocname:
                 _register_document(documents, docname, 'en')
             elif '_fr_' in ldocname:
                 _register_document(documents, docname, 'fr')
         try:
-            return bibrecdocs.get_bibdoc(documents[document]).get_file('.pdf').get_url()
+            return bibrecdocs.get_bibdoc(documents[document]) \
+                .get_file('.pdf').get_url()
         except InvenioBibDocFileError:
-            return bibrecdocs.get_bibdoc(documents[document]).get_file('.PDF').get_url()
+            return bibrecdocs.get_bibdoc(documents[document]) \
+                .get_file('.PDF').get_url()
     elif type == 'ADMIN-CIRC':
-        recids = perform_request_search(cc="Administrative Circulars", p='reportnumber:"CERN-ADMIN-CIRC-%s-*"' % number, sf="925__a")
+        recids = perform_request_search(
+            cc="Administrative Circulars",
+            p='reportnumber:"CERN-ADMIN-CIRC-%s-*"' % number,
+            sf="925__a")
         recid = recids[-1]
         documents = {}
         bibrecdocs = BibRecDocs(recid)
         for docname in bibrecdocs.get_bibdoc_names():
             ldocname = docname.lower()
             if 'implementation' in ldocname:
                 _register_document(documents, docname, 'implementation-en')
             elif 'application' in ldocname:
                 _register_document(documents, docname, 'implementation-fr')
             elif 'archiving' in ldocname:
                 _register_document(documents, docname, 'archiving-en')
             elif 'archivage' in ldocname:
                 _register_document(documents, docname, 'archiving-fr')
             elif 'annexe' in ldocname or 'annexes_fr' in ldocname:
                 _register_document(documents, docname, 'annex-fr')
             elif 'annexes_en' in ldocname or 'annex' in ldocname:
                 _register_document(documents, docname, 'annex-en')
-            elif '_en_' in ldocname or '_eng_' in ldocname or '_angl_' in ldocname:
+            elif '_en_' in ldocname or '_eng_' in ldocname \
+                 or '_angl_' in ldocname:
                 _register_document(documents, docname, 'en')
             elif '_fr_' in ldocname:
                 _register_document(documents, docname, 'fr')
         try:
-            return bibrecdocs.get_bibdoc(documents[document]).get_file('.pdf').get_url()
+            return bibrecdocs.get_bibdoc(
+                documents[document]).get_file('.pdf').get_url()
         except InvenioBibDocFileError:
-            return bibrecdocs.get_bibdoc(documents[document]).get_file('.PDF').get_url()
+            return bibrecdocs.get_bibdoc(
+                documents[document]).get_file('.PDF').get_url()
 
-def register_hr_redirections():
-    """
-    Run this only once
-    """
 
+def register_hr_redirections():
+    """Run this only once."""
     from invenio.modules.redirector.api import register_redirection
     plugin = 'goto_plugin_cern_hr_documents'
 
     ## Staff rules and regulations
     for modif in range(1, 20):
         for lang in ('en', 'fr'):
-            register_redirection('hr-srr-modif%02d-%s' % (modif, lang), plugin, parameters={'type': 'SRR', 'lang': lang, 'modif': modif})
+            register_redirection('hr-srr-modif%02d-%s' % (modif, lang),
+                                 plugin,
+                                 parameters={'type': 'SRR',
+                                             'lang': lang,
+                                             'modif': modif})
     for lang in ('en', 'fr'):
-        register_redirection('hr-srr-%s' % lang, plugin, parameters={'type': 'SRR', 'lang': lang, 'modif': 0})
+        register_redirection('hr-srr-%s' % lang, plugin,
+                             parameters={'type': 'SRR',
+                                         'lang': lang,
+                                         'modif': 0})
 
     ## Operational Circulars
     for number in range(1, 10):
         for lang in ('en', 'fr'):
-            register_redirection('hr-oper-circ-%s-%s' % (number, lang), plugin, parameters={'type': 'OPER-CIRC', 'document': lang, 'number': number})
-    for number, special_document in ((2, 'implementation'), (2, 'annex'), (3, 'archiving'), (3, 'annex')):
+            register_redirection('hr-oper-circ-%s-%s' % (number, lang),
+                                 plugin, parameters={'type': 'OPER-CIRC',
+                                                     'document': lang,
+                                                     'number': number})
+    for number, special_document in ((2, 'implementation'),
+                                     (2, 'annex'), (3, 'archiving'),
+                                     (3, 'annex')):
         for lang in ('en', 'fr'):
-            register_redirection('hr-circ-%s-%s-%s' % (number, special_document, lang), plugin, parameters={'type': 'OPER-CIRC', 'document': '%s-%s' % (special_document, lang), 'number': number})
+            register_redirection(
+                'hr-circ-%s-%s-%s' % (number, special_document, lang),
+                plugin,
+                parameters={'type': 'OPER-CIRC',
+                            'document': '%s-%s' % (special_document, lang),
+                            'number': number})
 
     ## Administrative Circulars:
     for number in range(1, 32):
         for lang in ('en', 'fr'):
-            register_redirection('hr-admin-circ-%s-%s' % (number, lang), plugin, parameters={'type': 'ADMIN-CIRC', 'document': lang, 'number': number})
+            register_redirection('hr-admin-circ-%s-%s' % (number, lang),
+                                 plugin,
+                                 parameters={'type': 'ADMIN-CIRC',
+                                             'document': lang,
+                                             'number': number})
+
 
 if __name__ == "__main__":
     register_hr_redirections()
diff --git a/invenio/modules/redirector/redirect_methods/goto_plugin_latest_record.py b/invenio/modules/redirector/redirect_methods/goto_plugin_latest_record.py
index 2ffddb467..e81cda325 100644
--- a/invenio/modules/redirector/redirect_methods/goto_plugin_latest_record.py
+++ b/invenio/modules/redirector/redirect_methods/goto_plugin_latest_record.py
@@ -1,60 +1,66 @@
 # -*- coding: utf-8 -*-
 ##
 ## This file is part of Invenio.
-## Copyright (C) 2012 CERN.
+## Copyright (C) 2012, 2013, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 """
+Demostrative PURL.
+
 Demostrative PURL implementing a redirection to the very last record
-(of a collection)
+(of a collection).
 """
 
 from invenio.config import CFG_SITE_NAME, CFG_SITE_RECORD
 from invenio.legacy.search_engine import perform_request_search
 from invenio.legacy.bibdocfile.api import BibRecDocs, InvenioBibDocFileError
 
-def goto(cc=CFG_SITE_NAME, p='', f='', sf='date', so='d', docname='', format=''):
+
+def goto(cc=CFG_SITE_NAME, p='', f='', sf='date', so='d',
+         docname='', format=''):
     """
+    Redirect the user to the latest record in the given collection.
+
     Redirect the user to the latest record in the given collection,
     optionally within the specified pattern and field. If docname
     and format are specified, redirect the user to the corresponding
     docname and format. If docname it is not specified, but there is
     only a single bibdoc attached to the record will redirect to that
     one.
     """
     recids = perform_request_search(cc=cc, p=p, f=f, sf=sf, so=so)
     if recids:
         # The first is the most recent because they are sorted by date
         # descending.
         recid = recids[0]
         url = '/%s/%s' % (CFG_SITE_RECORD, recid)
         if format:
             bibrecdocs = BibRecDocs(recid)
             if not docname:
                 if len(bibrecdocs.get_bibdoc_names()) == 1:
                     docname = bibrecdocs.get_bibdoc_names()[0]
                 else:
                     return url
             try:
                 bibdoc = BibRecDocs(recid).get_bibdoc(docname)
             except InvenioBibDocFileError:
                 return url
             try:
                 bibdocfile = bibdoc.get_file(format=format)
                 return bibdocfile.get_url()
             except InvenioBibDocFileError:
                 return url
         return url
diff --git a/invenio/modules/redirector/redirect_methods/goto_plugin_simple.py b/invenio/modules/redirector/redirect_methods/goto_plugin_simple.py
index 136ebbb65..d4767db9f 100644
--- a/invenio/modules/redirector/redirect_methods/goto_plugin_simple.py
+++ b/invenio/modules/redirector/redirect_methods/goto_plugin_simple.py
@@ -1,34 +1,30 @@
 # -*- coding: utf-8 -*-
 ##
 ## This file is part of Invenio.
-## Copyright (C) 2012 CERN.
+## Copyright (C) 2012, 2013, 2014 CERN.
 ##
 ## Invenio is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License as
 ## published by the Free Software Foundation; either version 2 of the
 ## License, or (at your option) any later version.
 ##
 ## Invenio is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ## General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with Invenio; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-"""
-Simple plugin to register an internal redirection
-"""
+"""Simple plugin to register an internal redirection."""
+
 from invenio.config import CFG_SITE_URL, CFG_SITE_SECURE_URL
 
+
 def goto(url):
-    """
-    Redirect to url (assuming it is internal to the system)
-    """
+    """Redirect to url (assuming it is internal to the system)."""
     if url.startswith('/'):
         url = CFG_SITE_URL + url
     if url.startswith(CFG_SITE_URL) or url.startswith(CFG_SITE_SECURE_URL):
         return url
-
-
diff --git a/invenio/modules/redirector/registry.py b/invenio/modules/redirector/registry.py
new file mode 100644
index 000000000..4dd6a9d53
--- /dev/null
+++ b/invenio/modules/redirector/registry.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##
+## This file is part of Invenio.
+## Copyright (C) 2014 CERN.
+##
+## Invenio is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2 of the
+## License, or (at your option) any later version.
+##
+## Invenio is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Invenio; if not, write to the Free Software Foundation, Inc.,
+## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+
+"""Registries for redirector module."""
+
+from flask.ext.registry import RegistryProxy
+
+from invenio.ext.registry import ModuleAutoDiscoverySubRegistry
+from invenio.utils.datastructures import LazyDict
+
+redirector_proxy = RegistryProxy('redirect_methods',
+                                 ModuleAutoDiscoverySubRegistry,
+                                 'redirect_methods')
+
+
+def register_redirect_methods():
+    """Register redirect methods."""
+    out = {}
+    for module in redirector_proxy:
+        if hasattr(module, 'goto'):
+            out[module.__name__.split('.')[-1]] = module.goto
+    return out
+
+
+def get_redirect_method(plugin_name):
+    """Return the function from the plugin name."""
+    return redirect_methods[plugin_name]
+
+redirect_methods = LazyDict(register_redirect_methods)
diff --git a/invenio/modules/redirector/scripts/__init__.py b/invenio/modules/redirector/scripts/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/invenio/modules/redirector/scripts/redirector.py b/invenio/modules/redirector/scripts/redirector.py
deleted file mode 100644
index 514868208..000000000
--- a/invenio/modules/redirector/scripts/redirector.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-## This file is part of Invenio.
-## Copyright (C) 2012, 2013 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-from __future__ import print_function
-
-"""GOTO CLI interface."""
-
-import optparse
-
-from invenio.base.factory import with_app_context
-
-from invenio.utils.text import wait_for_user
-from invenio.utils.json import json, json_unicode_to_utf8
-from ..api import (REDIRECT_METHODS, is_redirection_label_already_taken,
-                   register_redirection, update_redirection,
-                   drop_redirection, get_redirection_data)
-
-
-@with_app_context()
-def main():
-    """
-    Entry point for the CLI
-    """
-    def get_json_parameters_from_cli(option, dummy_opt_str, value, dummy_parser):
-        try:
-            option.parameters = json_unicode_to_utf8(json.loads(value))
-        except Exception as err:
-            raise optparse.OptionValueError("Cannot parse as a valid JSON serialization the provided parameters: %s. %s" % (value, err))
-
-    def get_parameter_from_cli(option, dummy_opt_str, value, dummy_parser):
-        if not hasattr(option, 'parameters'):
-            option.parameters = {}
-        param, value = value.split('=', 1)
-        try:
-            value = int(value)
-        except:
-            pass
-        option.parameters[param] = value
-
-    parser = optparse.OptionParser()
-
-    plugin_group = optparse.OptionGroup(parser, "Plugin Administration Options")
-    plugin_group.add_option("--list-plugins", action="store_const", dest="action", const="list-goto-plugins", help="List available GOTO plugins and their documentation")
-    #plugin_group.add_option("--list-broken-plugins", action="store_const", dest="action", const="list-broken-goto-plugins", help="List broken GOTO plugins")
-    parser.add_option_group(plugin_group)
-
-    redirection_group = optparse.OptionGroup(parser, "Redirection Manipultation Options")
-    redirection_group.add_option("-r", "--register-redirection", metavar="LABEL", action="store", dest="register", help="Register a redirection with the provided LABEL")
-    redirection_group.add_option("-u", "--update-redirection", metavar="LABEL", action="store", dest="update", help="Update the redirection specified by the provided LABEL")
-    redirection_group.add_option("-g", "--get-redirection", metavar="LABEL", action="store", dest="get_redirection", help="Get all information about a redirection specified by LABEL")
-    redirection_group.add_option("-d", "--drop-redirection", metavar="LABEL", action="store", dest="drop_redirection", help="Drop an existing redirection specified by LABEL")
-    parser.add_option_group(redirection_group)
-
-    specific_group = optparse.OptionGroup(parser, "Specific Options")
-    specific_group.add_option("-P", "--plugin", metavar="PLUGIN", action="store", dest="plugin", help="Specify the plugin to use when registering or updating a redirection")
-    specific_group.add_option("-j", "--json-parameters", metavar="PARAMETERS", action="callback", type="string", callback=get_json_parameters_from_cli, help="Specify the parameters to provide to the plugin (serialized in JSON)")
-    specific_group.add_option("-p", "--parameter", metavar="PARAM=VALUE", action="callback", callback=get_parameter_from_cli, help="Specify a single PARAM=VALUE parameter to be provided to the plugin (alternative to the JSON serialization)", type="string")
-    parser.add_option_group(specific_group)
-
-    (options, dummy_args) = parser.parse_args()
-    if options.action == "list-goto-plugins":
-        print("GOTO plugins found:")
-        for component, goto in REDIRECT_METHODS.items():
-            print(component + ' -> ' + getattr(goto, '__doc__',
-                                               'No documentation'))
-    #elif options.action == 'list-broken-goto-plugins':
-    #    print "Broken GOTO plugins found:"
-    #    for component, error in REDIRECT_METHODS.get_broken_plugins().items():
-    #        print component + '->' + str(error)
-    elif options.register:
-        label = options.register
-        plugin = options.plugin
-        parameters = getattr(options, 'parameters', {})
-        if not plugin in REDIRECT_METHODS:
-            parser.error("%s is not a valid plugin" % plugin)
-        if is_redirection_label_already_taken(label):
-            parser.error("The specified label %s is already taken" % label)
-        register_redirection(label, plugin, parameters)
-        print("The redirection %s was successfully registered for the plugin %s with parameters %s" % (label, plugin, parameters))
-    elif options.update:
-        label = options.update
-        if not is_redirection_label_already_taken(label):
-            parser.error("The specified label %s does not exist" % label)
-        redirection_data = get_redirection_data(label)
-        plugin = options.plugin or redirection_data['plugin']
-        parameters = options.parameters or redirection_data['parameters']
-        if not plugin in REDIRECT_METHODS:
-            parser.error("%s is not a valid plugin" % plugin)
-        update_redirection(label, plugin, parameters=None)
-        print("The redirection %s was successfully updated for the plugin %s with parameters %s" % (label, plugin, parameters))
-    elif options.get_redirection:
-        label = options.get_redirection
-        if not is_redirection_label_already_taken(label):
-            parser.error("The specified label %s does not exist" % label)
-        print(get_redirection_data(label))
-    elif options.drop_redirection:
-        label = options.drop_redirection
-        if is_redirection_label_already_taken(label):
-            wait_for_user("Are you sure you want to drop the redirection: %s\n%s" % (label, get_redirection_data(label)))
-            drop_redirection(label)
-            print("The redirection %s was successfully dropped" % label)
-        else:
-            print("The specified label %s is not registered with any redirection" % label)
-    else:
-        parser.print_help()
-
-
-if __name__ == "__main__":
-    main()