Fixed lack of helper functions for templates