Added functionality - template override