While the custom fields used embedded Go struct field, this does not work for map types and needs custom JSON marshaller to make sure custom fields appear without wrapper. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>