Added randomization and fault injection