Added flag handlers