Update to resolve templates better.