Replace embed interface with new mapping features