Update content template handling to be more flexible