Added some type parameter