Native template changes (incomplete)