Implemented SVY-6995: Refactor dataprovider type; move code in property
type as much as possible

Also did some fixes/enhancements here and there along the way.