added embedded Field support