More efficient approach, now on re-running no replication of classes created.