Moving more dependencies into bootstrapper