Add support for non-standard fields, fixed #19