Move facade creation to Bootstrap