Added a replacement for KeyValueField that uses a template