Added handling for custom phrase roles