Added missing template skeletons