Add support for non-standard fields, fixes #19