Code de-duplication, add and add_to templates added.