Add flat roster management