Some major changes to support mesh management