Template System Modificatios