Templates resolve added