[#BOXAPP-29: Adding extra template parameters]