Add KJ
New templated entries
Update