Draft of the new DSSObjectDataSource fixed