Update and rename dataDictionary not locked to dataDictionary locked by @BerndHekele