Adding Namespace Handling capability.