Refactored ODP and Mack bootstrap methods.