Added check for already generated data