Better handling of embedding + docs