Add Collection2, and schemas