refactored admin bundle