Added support for Collections and Secondary Indexes