FIX: Update DataObjectSet to ArrayList