Added collection and collection type classes