Added overridden template