fix collection problem with custom script datasource, and add more object for compatibility with existing parsers; reviewed by chet