WIP for better handling of data suppliers