Added object datasource handling and allowing duplicates