Added embedded mapping and test.