Add removing roles support