Added embed support