Improve flags