Started adding role mapping