Added a extended template