Better bootstrapping for new instances