Some Template improve.