Updated recursive templates support.