Adding roles support