Added templates back.