Updated flag and score models