Add completion for export