Added roles
Fixed warnings