Refactored Bootstrap-API