Fixing parameters reading
Fixing template use
Merging