Added hidden role field and locale field