Adaptions to handle namespaces