Add proper set of flags