Some data bootstrapping added