Added role swap ability