Adding namespace extraction
Updated with string, string map for extensibility..