Adding v2 and generic templates