Embedding entity support