master: Updated For Generated Templates