Updated the functionality handling (functionality now bound to template
name)