More work on namespace extraction