Major refactoring of PNT sensoring