Use new bootstrap file
Use dependencies in place of bash conditions