Simplified config URLs
Addeed XML namespaces
Match variable names with config