Format KeyValue and Model Classes