Added flag for no role