New Bootstrapper because i must not change the old framework
Merge