Need to resolve specific namespaces. Skeleton added