removed unnecessary entity wrapper
check for data provider configuration
change data provider registration