Changed template handling.