Added some features for InSiPiD as well.