Add roles support