Remove the need for having separate embedders