Fixed template to prevent deprecations