add decorated account provider
Merge branch 'develop'