Added additional bootstrap code