Added support for Embed definition