Refactor embedder to use bootstrap