Improved external embed support