Further changes in ProtoManager