Added role clean and update