Added support for Embed definition

continuation of #32