Added mutex guards