Fixed problems with tempalte having hardcoded values.