Added some generic types