Added a separate namespace.