api fix
Better use of bootstrapper