Fix bootstrap process

Add server handler option