Add UID support.
Add support for data_source field.