Some more rework of templates and container persistence, clean up of skill ids.