Make Bootstrapper more extendable