Added initial bootstrap integration