Embed optimizations v1