Added Template stuff