Changed the template to benefit from base