Native template changes