Added flag/unflag support