Have improved bootstrap process