Nat: changed templates, add rolefunctions, no update in render yet