Fixed another regression of previous SVY-6995 commits: Refactor
dataprovider type; move code in property type as much as possible