Upgrade master to threadsafe multiblock system