Updated mapping types
Added embedded collection mapping type