Changed some method signatures to return/accept ITemplate rather than Template