Updates to small template idea.