Added missing template functions