add prefix and comma handling