Added templates and stubs to remaining functions