Updates
Add custom role resolver