Attributes and embed snippet fixed and tested