Feature/insert flags