Improved embed support and update tools