Added additional configuration for international users