Move flags from scope to other field