Updated template to use correct method signatures.
Fix missing module imports