Rework the input templates