Improve Embedded Data #23