Tons of new Entities plus a better bootstrapping