Using the template resolver the right way, needs latest changes from adaro