Adding role check