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