Made some changes to ProtocolPackage and tested it. More tests could be run but it seems to be working now