Updated templates to use signature