Added mutex and topic system handling