OmitNamespaces if possible and update of documentation