Add support for embedded fields.

See #16