Added actual values into the templates