Added roles checking
Multiple roles support