Added type for the generic collections and lists