Add utility functions
Use new get_unique_id() utility
Add user_id and source_id parameters
Fixes for multiple datasets
Fixes for multiple datasets