Adding some support for ntup_common