Flag and Handler update