Some templating progresses