Started to add namespaces support