Updated generics files