Yes, that should be done in the future. Restricting from doing that already in this PR, as I would like to get just the flags in quickly for now.