Update mutex to be part of the manager