Integration of ScintillaNet 2.5 source