Refactored APIs for user role