Adding role support. Debug.