Booster is refactored