Added Templar and other updates