Replacing workarounds by data providers