#35 Add data provider for non lazy mode