Embedding options must be improved