Move creation to bootstrap