ProtoManager further changes