added roles support