Template modifications [2.x]