Changed update algorithm
Moved template values to config file