More splitting into templates