Template for Data provider enhanced