Adding support for the working mesh