Add locks and mrconfig