Added second template param