#988 - Updated query to add provider role associated
988 - Removed some dependencies