(status: Alpha-1.1)improve template behavior