add option to turn off adding prefixes