Added ability to set kind and locale fields